diff --git a/Mesh_3/include/CGAL/Mesh_criteria_3.h b/Mesh_3/include/CGAL/Mesh_criteria_3.h
index ee746617190..3d443afc466 100644
--- a/Mesh_3/include/CGAL/Mesh_criteria_3.h
+++ b/Mesh_3/include/CGAL/Mesh_criteria_3.h
@@ -152,16 +152,16 @@ and `C3T3::Triangulation` its nested triangulation type.
 \code{.cpp}
 
 // Create a Mesh_criteria_3<Tr> object with all cell and facet parameters set
-Mesh_criteria_3<Tr> criteria (parameters::facet_angle=30,
-                              parameters::facet_size=1,
-                              parameters::facet_distance=0.1,
-                              parameters::cell_radius_edge_ratio=2,
-                              parameters::cell_size=1.5);
+Mesh_criteria_3<Tr> criteria (parameters::facet_angle(30).
+                              parameters::facet_size(1).
+                              parameters::facet_distance(0.1).
+                              parameters::cell_radius_edge_ratio(2).
+                              parameters::cell_size(1.5));
 
 // Create a Mesh_criteria_3<Tr> object with size ignored (note that the order changed)
-Mesh_criteria_3<Tr> criteria (parameters::cell_radius_edge_ratio=2,
-                              parameters::facet_angle=30,
-                              parameters::facet_distance=0.1);
+Mesh_criteria_3<Tr> criteria (parameters::cell_radius_edge_ratio(2).
+                              parameters::facet_angle(30).
+                              parameters::facet_distance(0.1));
 
 \endcode
 
diff --git a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
index 7781f8b1ada..ad6cb667cba 100644
--- a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
+++ b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
@@ -605,7 +605,7 @@ public:
   Corner_index register_corner(const Point_3& p, const Curve_index& index);
   Corner_index add_corner_with_context(const Point_3& p, const Surface_patch_index& index);
 
-  /// Overloads where the last parameter `out` is not
+  /// Overload where the last parameter `out` is not
   /// `CGAL::Emptyset_iterator()`.
   template <typename InputIterator, typename IndicesOutputIterator>
   IndicesOutputIterator
diff --git a/Mesh_3/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h
index 06a27a790ff..21b159bd764 100644
--- a/Mesh_3/include/CGAL/refine_mesh_3.h
+++ b/Mesh_3/include/CGAL/refine_mesh_3.h
@@ -303,7 +303,7 @@ void refine_mesh_3(C3T3& c3t3, MeshDomain& domain, MeshCriteria& criteria, const
  * @brief This function refines the mesh c3t3 wrt domain & criteria
  *
  * @param c3t3 the mesh to be refined.
- * @param domain the domain used to create the `c3t3` parameter
+ * @param domain the domain used to be discretized
  * @param criteria the criteria
  * @param exude if `true`, an exudation step will be done at
  *   the end of the Delaunay refinement process
diff --git a/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h b/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h
index 6c837d5add9..7b048c15d9d 100644
--- a/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h
+++ b/Periodic_3_mesh_3/include/CGAL/optimize_periodic_3_mesh_3.h
@@ -38,7 +38,7 @@ Mesh_optimization_return_code perturb_periodic_3_mesh_3(C3T3& c3t3, MeshDomain&
 {
   using parameters::choose_parameter;
   using parameters::get_parameter;
-  double time_limit = choose_parameter(get_parameter(np,internal_np::maximum_running_time),0);
+  double time_limit = choose_parameter(get_parameter(np,internal_np::maximum_running_time),parameters::default_values_for_mesh_3::time_limit);
   auto sliver_bound = choose_parameter(get_parameter(np,internal_np::lower_sliver_bound), parameters::default_values_for_mesh_3::perturb_sliver_bound);
   auto sliver_criterion = choose_parameter(get_parameter(np, internal_np::sliver_criteria), parameters::default_values_for_mesh_3::default_sliver_criterion(c3t3,sliver_bound));
   auto perturbation_vector = choose_parameter(get_parameter(np,internal_np::perturb_vector), default_perturbation_vector(c3t3,domain,sliver_criterion));
diff --git a/STL_Extension/include/CGAL/Named_function_parameters.h b/STL_Extension/include/CGAL/Named_function_parameters.h
index 4f6cea2f174..e8d22f685d6 100644
--- a/STL_Extension/include/CGAL/Named_function_parameters.h
+++ b/STL_Extension/include/CGAL/Named_function_parameters.h
@@ -484,7 +484,7 @@ struct Boost_parameter_compatibility_wrapper<Tag, true>
     typedef Named_function_parameters<K, internal_np::X> Params;\
     return Params(p);                          \
   }
-// TODO: need to make sure this works when using several compilation units
+
 #define CGAL_add_named_parameter_with_compatibility(X, Y, Z)        \
   const Boost_parameter_compatibility_wrapper<internal_np::X> Z;
 #define CGAL_add_named_parameter_with_compatibility_ref_only(X, Y, Z)        \