Index: /issm/trunk-jpl/src/c/bamg/Mesh.cpp
===================================================================
--- /issm/trunk-jpl/src/c/bamg/Mesh.cpp	(revision 20620)
+++ /issm/trunk-jpl/src/c/bamg/Mesh.cpp	(revision 20621)
@@ -238,9 +238,7 @@
 		if(VertexOnBThEdge)      delete [] VertexOnBThEdge;
 
-		if(&Gh){
-			if (Gh.NbRef>0) Gh.NbRef--;
-			else if (Gh.NbRef==0) delete &Gh;
-		}
-		if(&BTh && (&BTh != this)){
+		if (Gh.NbRef>0) Gh.NbRef--;
+		else if (Gh.NbRef==0) delete &Gh;
+		if(&BTh != this){
 			if (BTh.NbRef>0) BTh.NbRef--;
 			else if (BTh.NbRef==0) delete &BTh;
@@ -3065,6 +3063,7 @@
 			Triangle &t=triangles[it];
 			for (int j=0;j<3;j++){
-				Triangle &tt = *t.TriangleAdj(j);
-				if ( (!&tt ||  it < GetId(tt)) && ( tt.link || t.link)){
+				Triangle *ptt=t.TriangleAdj(j);
+				Triangle &tt = *ptt;
+				if ( (!ptt ||  it < GetId(tt)) && ( tt.link || t.link)){
 					BamgVertex &v0 = t[VerticesOfTriangularEdge[j][0]];
 					BamgVertex &v1 = t[VerticesOfTriangularEdge[j][1]];
@@ -3905,6 +3904,7 @@
 						_error_("vertices+i != ta.EdgeVertex(1)");
 					}
-					BamgVertex & vj = *(ta.EdgeVertex(0));
-					if ( &vj ) {
+					BamgVertex *pvj = (ta.EdgeVertex(0));
+					BamgVertex & vj = *pvj;
+					if(pvj){
 						j= &vj-vertices;
 						if (j<0 || j >= nbv){
@@ -3959,6 +3959,9 @@
 			 for (int j=0;j<3;j++)
 			  if(!t.Locked(j) && !t.Hidden(j)){
-				  Triangle &tt = *t.TriangleAdj(j);
-				  if ( &tt && tt.link && it < GetId(tt)) 
+
+				  Triangle *ptt = t.TriangleAdj(j);
+				  Triangle &tt = *ptt;
+
+				  if( ptt && tt.link && it < GetId(tt)) 
 					 { // an internal edge 
 					  BamgVertex &v0 = t[VerticesOfTriangularEdge[j][0]];
Index: /issm/trunk-jpl/src/c/bamg/VertexOnGeom.cpp
===================================================================
--- /issm/trunk-jpl/src/c/bamg/VertexOnGeom.cpp	(revision 20620)
+++ /issm/trunk-jpl/src/c/bamg/VertexOnGeom.cpp	(revision 20621)
@@ -52,5 +52,5 @@
 	/*}}}*/
 	int VertexOnGeom::IsRequiredVertex() {/*{{{*/
-		return this? ((curvilincoord<0 ? (gv?gv->Required():0):0 )) : 0;
+		return ((curvilincoord<0 ? (gv?gv->Required():0):0 ));
 	}
 	/*}}}*/