diff --git a/Geo/GModelIO_GEO.cpp b/Geo/GModelIO_GEO.cpp
index 06db036756a2ecd1c27b43f63b8281608326e226..00b9dab94064864aacf26151640264fc9da593ac 100644
--- a/Geo/GModelIO_GEO.cpp
+++ b/Geo/GModelIO_GEO.cpp
@@ -929,8 +929,8 @@ void GEO_Internals::synchronize(GModel *model)
           e->meshAttributes.extrude = c->Extrude;
           e->meshAttributes.reverseMesh = c->ReverseMesh;
           model->add(e);
+          if(c->degenerated) e->setTooSmall(true);
         }
-        if(c->degenerated) e->setTooSmall(true);
       }
     }
     List_Delete(curves);
@@ -973,9 +973,9 @@ void GEO_Internals::synchronize(GModel *model)
         f->meshAttributes.extrude = s->Extrude;
         f->meshAttributes.transfiniteArrangement = s->Recombine_Dir;
         f->meshAttributes.corners.clear();
-        for(int i = 0; i < List_Nbr(s->TrsfPoints); i++){
+        for(int j = 0; j < List_Nbr(s->TrsfPoints); j++){
           Vertex *corn;
-          List_Read(s->TrsfPoints, i, &corn);
+          List_Read(s->TrsfPoints, j, &corn);
           GVertex *gv = f->model()->getVertexByTag(corn->Num);
           if(gv)
             f->meshAttributes.corners.push_back(gv);
@@ -989,8 +989,8 @@ void GEO_Internals::synchronize(GModel *model)
         model->add(f);
       }
       else{
-        if(s->Typ == MSH_SURF_PLAN)
-          f->computeMeanPlane(); // recompute in case geom has changed
+        // recompute in case geom has changed
+        if(s->Typ == MSH_SURF_PLAN) f->computeMeanPlane();
         f->resetMeshAttributes();
       }
     }
@@ -1034,10 +1034,10 @@ void GEO_Internals::synchronize(GModel *model)
       GEntity *ge = 0;
       int tag = CTX::instance()->geom.orientedPhysicals ? abs(num) : num;
       switch(p->Typ){
-        case MSH_PHYSICAL_POINT:   ge = model->getVertexByTag(tag); break;
-        case MSH_PHYSICAL_LINE:    ge = model->getEdgeByTag(tag); break;
-        case MSH_PHYSICAL_SURFACE: ge = model->getFaceByTag(tag); break;
-        case MSH_PHYSICAL_VOLUME:  ge = model->getRegionByTag(tag); break;
+      case MSH_PHYSICAL_POINT:   ge = model->getVertexByTag(tag); break;
+      case MSH_PHYSICAL_LINE:    ge = model->getEdgeByTag(tag); break;
+      case MSH_PHYSICAL_SURFACE: ge = model->getFaceByTag(tag); break;
+      case MSH_PHYSICAL_VOLUME:  ge = model->getRegionByTag(tag); break;
       }
       int pnum = CTX::instance()->geom.orientedPhysicals ?
         (gmsh_sign(num) * p->Num) : p->Num;
diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp
index 8bdc0aa2b448b8efc33e442515326758d3400df2..d206da49970914087a095d013e65d4310cbf20da 100644
--- a/Geo/GeoInterpolation.cpp
+++ b/Geo/GeoInterpolation.cpp
@@ -528,7 +528,7 @@ Vertex InterpolateCurve(Curve *c, double u, int derivee)
     break;
 
   default:
-    Msg::Error("Unknown curve type in interpolation");
+    Msg::Error("Unknown curve type %d in interpolation", c->Typ);
     break;
   }
   V.u = u;