diff --git a/Common/onelab.h b/Common/onelab.h
index 9c1f13766c38f8c6f68c0338cdb9f32cb3bca85a..c56bf1fd9f85e5b85a2da6af9f3da8798eb3305d 100644
--- a/Common/onelab.h
+++ b/Common/onelab.h
@@ -748,7 +748,7 @@ namespace onelab{
              const std::string &client=""){ return _get(ps, name, client, _functions); }
     unsigned int getNumParameters()
     {
-      return _numbers.size() + _strings.size() + _regions.size() + _functions.size();
+      return (int)(_numbers.size() + _strings.size() + _regions.size() + _functions.size());
     }
     // check if at least one parameter depends on the given client
     bool hasClient(const std::string &client) const
@@ -943,7 +943,7 @@ namespace onelab{
     typedef std::map<std::string, client*>::iterator citer;
     citer firstClient(){ return _clients.begin(); }
     citer lastClient(){ return _clients.end(); }
-    int getNumClients() { return _clients.size(); };
+    int getNumClients() { return (int)_clients.size(); };
     citer findClient(const std::string &name){ return _clients.find(name); }
     void registerClient(client *c)
     {
diff --git a/Geo/GEdgeLoop.h b/Geo/GEdgeLoop.h
index 90256f25fcb604b9eb859896577e25f11187d407..4b3919c3b495b201fafc85a7a7b0baed1f0e1f19 100644
--- a/Geo/GEdgeLoop.h
+++ b/Geo/GEdgeLoop.h
@@ -25,7 +25,7 @@ struct GEdgeSigned
   int getSign(){ return _sign; }
 };
 
-class GEdgeLoop 
+class GEdgeLoop
 {
  private:
   std::list<GEdgeSigned> loop;
@@ -39,7 +39,7 @@ class GEdgeLoop
   inline citer end() const { return loop.end(); }
   inline void erase(iter it){ loop.erase(it); }
   int count(GEdge*) const;
-  int count() const { return loop.size(); }
+  int count() const { return (int)loop.size(); }
 };
 
 #endif
diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index 21bd3b03b2cae5a8036109a688c93f2d42a273b7..c1011296183c08842bf37eabbe08870bcc3d7a7f 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -111,8 +111,8 @@ class GEntity {
   };
 
   enum MeshGenerationStatus {
-    PENDING, 
-    DONE, 
+    PENDING,
+    DONE,
     FAILED
   };
 
@@ -192,7 +192,7 @@ class GEntity {
   virtual std::list<GVertex*> vertices() const { return std::list<GVertex*>(); }
 
   // for python, temporary solution while iterator are not binded
-  std::vector<GRegion*> bindingsGetRegions() { 
+  std::vector<GRegion*> bindingsGetRegions() {
     std::list<GRegion*> r = regions();  // NOTE : two-line to dont create two different lists with diff pointers
     return std::vector<GRegion*> (r.begin(), r.end());
   }
@@ -257,7 +257,7 @@ class GEntity {
     return physicals;
   }
 
-  // returns the tag of the entity that its master entity (for mesh) 
+  // returns the tag of the entity that its master entity (for mesh)
   int meshMaster() const;
   void setMeshMaster(int m);
 
@@ -270,7 +270,7 @@ class GEntity {
   // get/set the visibility flag
   virtual char getVisibility();
   virtual void setVisibility(char val, bool recursive=false){ _visible = val; }
-  
+
   // get/set the selection flag
   virtual char getSelection(){ return _selection; }
   virtual void setSelection(char val){ _selection = val; }
@@ -310,7 +310,7 @@ class GEntity {
   void setAllElementsVisible(bool val){ _allElementsVisible = val ? 1 : 0; }
 
   // get the number of mesh vertices in the entity
-  unsigned int getNumMeshVertices() { return mesh_vertices.size(); }
+  unsigned int getNumMeshVertices() { return (int)mesh_vertices.size(); }
 
   // get the mesh vertex at the given index
   MVertex *getMeshVertex(unsigned int index) { return mesh_vertices[index]; }
diff --git a/Geo/MFace.h b/Geo/MFace.h
index 0f4f095ae872c647e0a588ff1fc5b77cf4bdd4ea..dd16c1c02b4a8832f0d83fe907ffc2bbc27e9491 100644
--- a/Geo/MFace.h
+++ b/Geo/MFace.h
@@ -17,13 +17,13 @@
 class MFace {
  private:
   std::vector<MVertex *> _v;
-  std::vector<char> _si; // sorted indices 
+  std::vector<char> _si; // sorted indices
 
  public:
   MFace() {}
   MFace(MVertex *v0, MVertex *v1, MVertex *v2, MVertex *v3=0);
   MFace(const std::vector<MVertex*> v);
-  inline int getNumVertices() const { return _v.size(); }
+  inline int getNumVertices() const { return (int)_v.size(); }
   inline MVertex *getVertex(const int i) const { return _v[i]; }
   inline MVertex *getSortedVertex(const int i) const { return _v[int(_si[i])]; }
   inline MEdge getEdge(const int i) const
@@ -46,7 +46,7 @@ class MFace {
   SVector3 normal() const;
   SVector3 tangent(int num) const
   {
-    SVector3 t0(_v[1]->x() - _v[0]->x(), 
+    SVector3 t0(_v[1]->x() - _v[0]->x(),
                 _v[1]->y() - _v[0]->y(),
                 _v[1]->z() - _v[0]->z());
     t0.normalize();
@@ -87,13 +87,13 @@ class MFace {
       const double ff[4] = {(1 - u) * (1. - v),
                             (1 + u) * (1. - v),
                             (1 + u) * (1. + v),
-                            (1 - u) * (1. + v)};        
+                            (1 - u) * (1. + v)};
       for(int i = 0; i < n; i++) {
         MVertex *v = getVertex(i);
         p[0] += v->x() * ff[i] * .25;
         p[1] += v->y() * ff[i] * .25;
         p[2] += v->z() * ff[i] * .25;
-      } 
+      }
     }
     else
       Msg::Error("Cannot interpolate inside a polygonal MFace with more than 4 edges");