diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp
index 6601183a8bf49a0c7eb8b542c3cac76eb9cf22c1..b8800e65e84dc6e7d7867f5f77e3b8386f3fdc26 100644
--- a/Mesh/yamakawa.cpp
+++ b/Mesh/yamakawa.cpp
@@ -3987,7 +3987,7 @@ void PostOp::pyramids2(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){
 
     temp2 = new MPyramid(a,b,c,d,mid);
     gr->addPyramid(temp2);
-    markings.insert(std::pair<MElement*,bool>(temp2,0));
+    markings.insert(std::pair<MElement*,bool>(temp2,false));
     build_vertex_to_pyramids(temp2);
 
     for(it=tetrahedra.begin();it!=tetrahedra.end();it++){
@@ -4000,13 +4000,13 @@ void PostOp::pyramids2(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){
 
         temp = new MTetrahedron(N1,N2,diagA,mid);
         gr->addTetrahedron(temp);
-        markings.insert(std::pair<MElement*,bool>(temp,0));
+        markings.insert(std::pair<MElement*,bool>(temp,false));
         build_vertex_to_tetrahedra(temp);
         movables.push_back(temp);
 
         temp = new MTetrahedron(N1,N2,diagB,mid);
         gr->addTetrahedron(temp);
-        markings.insert(std::pair<MElement*,bool>(temp,0));
+        markings.insert(std::pair<MElement*,bool>(temp,false));
         build_vertex_to_tetrahedra(temp);
         movables.push_back(temp);
 
@@ -4041,13 +4041,13 @@ void PostOp::pyramids2(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){
 
       temp2 = new MPyramid(v1,v2,v3,v4,mid);
       gr->addPyramid(temp2);
-      markings.insert(std::pair<MElement*,bool>(temp2,0));
+      markings.insert(std::pair<MElement*,bool>(temp2,false);
       build_vertex_to_pyramids(temp2);
 
       if(different(v1,v2,diagA,diagB)){
         temp = new MTetrahedron(v1,v2,mid,v5);
         gr->addTetrahedron(temp);
-        markings.insert(std::pair<MElement*,bool>(temp,0));
+        markings.insert(std::pair<MElement*,bool>(temp,false));
         build_vertex_to_tetrahedra(temp);
         movables.push_back(temp);
       }
@@ -4055,7 +4055,7 @@ void PostOp::pyramids2(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){
       if(different(v2,v3,diagA,diagB)){
         temp = new MTetrahedron(v2,v3,mid,v5);
         gr->addTetrahedron(temp);
-        markings.insert(std::pair<MElement*,bool>(temp,0));
+        markings.insert(std::pair<MElement*,bool>(temp,false));
         build_vertex_to_tetrahedra(temp);
         movables.push_back(temp);
       }
@@ -4063,7 +4063,7 @@ void PostOp::pyramids2(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){
       if(different(v3,v4,diagA,diagB)){
         temp = new MTetrahedron(v3,v4,mid,v5);
         gr->addTetrahedron(temp);
-        markings.insert(std::pair<MElement*,bool>(temp,0));
+        markings.insert(std::pair<MElement*,bool>(temp,false));
         build_vertex_to_tetrahedra(temp);
         movables.push_back(temp);
       }
@@ -4071,7 +4071,7 @@ void PostOp::pyramids2(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){
       if(different(v4,v1,diagA,diagB)){
         temp = new MTetrahedron(v4,v1,mid,v5);
         gr->addTetrahedron(temp);
-        markings.insert(std::pair<MElement*,bool>(temp,0));
+        markings.insert(std::pair<MElement*,bool>(temp,false));
         build_vertex_to_tetrahedra(temp);
         movables.push_back(temp);
       }
diff --git a/Numeric/MetricBasis.cpp b/Numeric/MetricBasis.cpp
index d07f1639bf83b9cd93a6cf0eafe6d670df6cf0a6..4b9aeb241729c48280988810ece9f4cf2cec5e6b 100644
--- a/Numeric/MetricBasis.cpp
+++ b/Numeric/MetricBasis.cpp
@@ -169,7 +169,7 @@ double MetricBasis::getMinR(MElement *el, MetricData *&md, int deg) const
       else*/
       _computeRmin(*coeff, *jac, RminLag, RminBez, 0, false);
 
-      double betaOpt = beta, minaOpt, maxaOpt = maxaOpt, RminBezOpt;
+      double betaOpt = beta, minaOpt, maxaOpt = 0., RminBezOpt;
       {
         /*const */double phi = std::acos(.5*(minK-maxa3*maxa3*maxa3+3*maxa3))/3;
         RminBezOpt = (maxa3+2*std::cos(phi+2*M_PI/3))/(maxa3+2*std::cos(phi));
@@ -278,7 +278,7 @@ bool MetricBasis::notStraight(MElement *el, double &metric, int deg) const
       break;
     default :
       Msg::Error("Unknown Jacobian function space for element type %d", el->getType());
-      return -1;
+      return false;
   }
 
   MetricData *md;