diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_and_line_policies.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_and_line_policies.h
index e96d2738c1a..890e21bfcfb 100644
--- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_and_line_policies.h
+++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/GarlandHeckbert_plane_and_line_policies.h
@@ -38,7 +38,7 @@ struct GH_helper{
   typedef typename GT::FT FT;
 
   typedef dynamic_vertex_property_t<Vector_3>                                       Vertex_normal_tag;
-  typedef typename boost::property_map<TriangleMesh, Vertex_normal_tag>::const_type Vertex_normal_dmap;
+  typedef typename boost::property_map<TriangleMesh, Vertex_normal_tag>::type       Vertex_normal_dmap;
   typedef typename internal_np::Lookup_named_param_def<internal_np::vertex_normal_map_t,
                                                        NamedParameters,
                                                        Vertex_normal_dmap>::type    Vertex_normal_map;
@@ -46,7 +46,7 @@ struct GH_helper{
   const NamedParameters &np;
   GH_helper(const NamedParameters &np_):np(np_){ }
 
-  Vertex_normal_map vnm(const TriangleMesh& tmesh) const{
+  Vertex_normal_map vnm(TriangleMesh& tmesh) const{
     using parameters::choose_parameter;
     using parameters::is_default_parameter;
     using parameters::get_parameter;
@@ -66,7 +66,7 @@ struct GH_helper{
     return choose_parameter(get_parameter(np, internal_np::line_policies_weight), 0.01);
   }
 
-  FT dm() const{
+  double dm() const{
     using parameters::choose_parameter;
     using parameters::get_parameter;
 
diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_composed_policies.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_composed_policies.h
index e3b73b5be9b..943901ab321 100644
--- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_composed_policies.h
+++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_composed_policies.h
@@ -121,15 +121,15 @@ public:
 
 public:
   GarlandHeckbert_composed_policies(TriangleMesh& tmesh,
-                                    double w1=1., double w2=1.,const FT dm = FT(100))
-    : Base(tmesh, Quadric_calculator(w1, w2), dm)
+                                    double w1=1., double w2=1.,const double dm = 100)
+    : Base(tmesh, Quadric_calculator(w1, w2), FT(dm))
   { }
 
   GarlandHeckbert_composed_policies(TriangleMesh& tmesh,
                                     GH_policies_1 ghp1,
                                     GH_policies_2 ghp2,
-                                    double w1=1., double w2=1.,const FT dm = FT(100))
-    : Base(tmesh, Quadric_calculator(ghp1.quadric_calculator(), ghp2.quadric_calculator(), w1, w2), dm)
+                                    double w1=1., double w2=1.,const double dm = 100)
+    : Base(tmesh, Quadric_calculator(ghp1.quadric_calculator(), ghp2.quadric_calculator(), w1, w2), FT(dm))
   { }
 
 public:
diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_line_policies.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_line_policies.h
index ff3506851f1..c444fb1eb8a 100644
--- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_line_policies.h
+++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/internal/GarlandHeckbert_line_policies.h
@@ -94,7 +94,7 @@ public:
 template<typename TriangleMesh,
          typename GeomTraits,
          typename VertexNormalMap = typename boost::property_map<TriangleMesh,
-                                                CGAL::dynamic_vertex_property_t<typename GeomTraits::Vector_3> >::const_type >
+                                                CGAL::dynamic_vertex_property_t<typename GeomTraits::Vector_3> >::type >
 class GarlandHeckbert_line_policies
   : public internal::GarlandHeckbert_cost_and_placement<
              internal::Line_quadric_calculator<TriangleMesh, GeomTraits>, TriangleMesh, GeomTraits>