diff --git a/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h b/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
index d2208fe9339..ddc3f15289b 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
@@ -69,7 +69,7 @@ public:
   OMesh_edge
   opposite_edge() const { return OMesh_edge(Halfedge_handle((halfedge_.idx() & 1) ? halfedge_.idx()-1 : halfedge_.idx()+1)); }
 
-  std::size_t idx() const { return halfedge_.idx() / 2; }
+  unsigned int idx() const { return halfedge_.idx() / 2; }
 private:
   Halfedge_handle halfedge_;
 };
diff --git a/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h b/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
index 97c51f94fa7..d825f7029a5 100644
--- a/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
+++ b/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
@@ -53,12 +53,12 @@ private:
 };
 
 template <typename K, typename VEF>
-class OM_index_pmap : public boost::put_get_helper<std::size_t, OM_index_pmap<K,VEF> >
+class OM_index_pmap : public boost::put_get_helper<unsigned int, OM_index_pmap<K,VEF> >
 {
 public:
   typedef boost::readable_property_map_tag category;
-  typedef std::size_t                      value_type;
-  typedef std::size_t                      reference;
+  typedef unsigned int                      value_type;
+  typedef unsigned int                      reference;
   typedef VEF                              key_type;
 
   value_type operator[](const key_type& vd) const
@@ -113,7 +113,7 @@ public:
     const_cast<OpenMesh::PolyMesh_ArrayKernelT<K>&>(*pm.sm_).set_point(v,p);
 #else
     const_cast<OpenMesh::PolyMesh_ArrayKernelT<K>&>(*pm.sm_).set_point
-      (v, typename OpenMesh::PolyMesh_ArrayKernelT<K>::Point(p[0], p[1], p[2]));
+      (v, typename OpenMesh::PolyMesh_ArrayKernelT<K>::Point((float)p[0], (float)p[1], (float)p[2]));
 #endif
   }
 
diff --git a/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h b/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h
index 51f41a18d60..3aad72cc705 100644
--- a/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h
+++ b/BGL/include/CGAL/boost/graph/properties_Surface_mesh.h
@@ -63,12 +63,12 @@ private:
 
 
 template <typename K, typename VEF>
-class SM_index_pmap : public boost::put_get_helper<std::size_t, SM_index_pmap<K,VEF> >
+class SM_index_pmap : public boost::put_get_helper<int, SM_index_pmap<K,VEF> >
 {
 public:
   typedef boost::readable_property_map_tag category;
-  typedef std::size_t                      value_type;
-  typedef std::size_t                      reference;
+  typedef int                              value_type;
+  typedef int                              reference;
   typedef VEF                              key_type;
 
   value_type operator[](const key_type& vd) const