diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 95d932e49d8e108f1527910573bebfebc2e13928..1f750f869d948d9d39f223c1dd97ced91e77b222 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -450,13 +450,13 @@ static void Mesh2D(GModel *m)
     while(1){
       meshGFace mesher;
       int nbPending = 0;
-      for(GModel::fiter it = f.begin(); it != f.end(); ++it){
+      for(std::set<GFace*>::iterator it = f.begin(); it != f.end(); ++it){
         if ((*it)->meshStatistics.status == GFace::PENDING){
           mesher(*it);
           nbPending++;
         }
       }
-      for(GModel::fiter it = cf.begin(); it != cf.end(); ++it){
+      for(std::set<GFace*>::iterator = cf.begin(); it != cf.end(); ++it){
         if ((*it)->meshStatistics.status == GFace::PENDING){
           mesher(*it);
           nbPending++;
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index c95bf5618af3d4af2c5e23ef7b7070fc170e6406..1417a619cb6b729f68ee93d4c314332cade8173f 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -35,7 +35,8 @@ static bool mappingIsInvertible(MTetrahedron *e)
   
   fullMatrix<double> df;
   {
-    const fullMatrix<double> &alldf = e->getGradShapeFunctionsAtIntegrationPoints(e->getPolynomialOrder());
+    const fullMatrix<double> &alldf = 
+      e->getGradShapeFunctionsAtIntegrationPoints(e->getPolynomialOrder());
     for (int i = 0; i < alldf.size2()/3; i++){
       df.setAsProxy(alldf, 3*i, 3);
       e->getJacobian(df, mat);
@@ -44,7 +45,8 @@ static bool mappingIsInvertible(MTetrahedron *e)
   }
   {
     const fullMatrix<double> &points = e->getFunctionSpace()->points;
-    const fullMatrix<double> &alldf = e->getGradShapeFunctionsAtNodes(e->getPolynomialOrder());
+    const fullMatrix<double> &alldf = 
+      e->getGradShapeFunctionsAtNodes(e->getPolynomialOrder());
     double gradShapeFunctions[300][3];
     for (int i = 0; i < alldf.size2()/3; i++){
       df.setAsProxy(alldf, 3*i, 3);
@@ -476,7 +478,7 @@ static void reorientTrianglePoints(std::vector<MVertex*> &vtcs, int orientation,
   int nbPts = vtcs.size();
   if (nbPts <= 1) return;
   std::vector<MVertex*> tmp(nbPts);
-  int interiorOrder = (int)((sqrt(1+8*nbPts)-3)/2);
+  int interiorOrder = (int)((sqrt(1. + 8. * nbPts) - 3) / 2);
   int pos = 0;
   for (int o = interiorOrder; o>0; o-=3) {
     if (swap) {