diff --git a/Mesh_2/doc/Mesh_2/dependencies b/Mesh_2/doc/Mesh_2/dependencies
index 0c0f7765312..696bf34e1fb 100644
--- a/Mesh_2/doc/Mesh_2/dependencies
+++ b/Mesh_2/doc/Mesh_2/dependencies
@@ -5,4 +5,3 @@ Algebraic_foundations
 Circulator
 Stream_support
 Triangulation_2
-BGL
diff --git a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
index 0820a9a429e..20f622733c0 100644
--- a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
@@ -597,12 +597,12 @@ where the labeled image is used with a precomputed 3D image of weights :
             if (weights_.is_valid())
             {
                 return Labeled_mesh_domain_3
-                        (create_weighted_labeled_image_wrapper
+                        (p::function(create_weighted_labeled_image_wrapper
                                  (image_,
                                   weights_,
                                   image_values_to_subdomain_indices_,
-                                  value_outside_),
-                         Mesh_3::internal::compute_bounding_box(image_),
+                                  value_outside_)),
+                         p::bounding_object(Mesh_3::internal::compute_bounding_box(image_)),
                          p::relative_error_bound = relative_error_bound_,
                          p::p_rng = p_rng_,
                          p::null_subdomain_index =
@@ -613,11 +613,11 @@ where the labeled image is used with a precomputed 3D image of weights :
             else
             {
                 return Labeled_mesh_domain_3
-                        (create_labeled_image_wrapper
+                        (p::function(create_labeled_image_wrapper
                                  (image_,
                                   image_values_to_subdomain_indices_,
-                                  value_outside_),
-                         Mesh_3::internal::compute_bounding_box(image_),
+                                  value_outside_)),
+                         p::bounding_object(Mesh_3::internal::compute_bounding_box(image_)),
                          p::relative_error_bound = relative_error_bound_,
                          p::p_rng = p_rng_,
                          p::null_subdomain_index =
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_function.h b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_function.h
index d5249e256b9..9681a52738b 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_function.h
+++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_function.h
@@ -232,7 +232,7 @@ initialize(const Mesh_criteria& criteria, Mesh_fnt::Domain_tag)
      criteria,
      p_.protect_features,
      p::mesh_3_options(p::pointer_to_stop_atomic_boolean = &stop_,
-                       p::nonlinear_growth_of_balls = true));
+                       p::nonlinear_growth_of_balls = true).v);
 }
 
 template < typename D_, typename Tag >
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp
index 627afb7577b..0ceb091a78a 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp
@@ -171,7 +171,7 @@ Optimizer_thread* cgal_code_optimization(Scene_c3t3_item& c3t3_item,
                            p_function->bbox().zmax());
 
     Function_mesh_domain* p_domain =
-      new Function_mesh_domain(Function_wrapper(*p_function), dom_bbox, 1e-7,
+      new Function_mesh_domain(CGAL::parameters::function = Function_wrapper(*p_function), CGAL::parameters::bounding_object = dom_bbox, CGAL::parameters::relative_error_bound = 1e-7,
                                CGAL::parameters::construct_surface_patch_index =
                                  [](int i, int j) { return (i * 1000 + j); } );