diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h
index cefa0a924c9..cb3f4e68239 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h
@@ -430,7 +430,11 @@ public:
 
       Curve_analysis_2 operator()
         (const Polynomial_2& f) const {
-        return _m_kernel->curve_cache_2()(f);
+        if (_m_kernel->is_square_free_2_object()(f)) {
+          return _m_kernel->curve_cache_2()(f);
+        } else {
+          return _m_kernel->curve_cache_2()(_m_kernel->make_square_free_2_object()(f));
+        }
       }
 
     protected:
diff --git a/Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h b/Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
index 49cf839bd37..8d3aff70392 100644
--- a/Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
+++ b/Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
@@ -887,16 +887,6 @@ public:
     base().clear_sources();
   }
 
-  /**
-   * get estimated distance from the current source set to a vertex `vd`.
-   * \warning The return type is `double` even when used with an exact kernel.
-   */
-  double
-  estimate_geodesic_distance(vertex_descriptor vd) const
-  {
-    return base().estimate_geodesic_distance(vd);
-  }
-
   /**
    * returns the source set.
    */
@@ -906,7 +896,6 @@ public:
     return base().sources();
   }
 
-
   /**
    * fills the distance property map with the estimated geodesic distance of each vertex to the closest source vertex.
    * \tparam VertexDistanceMap a property map model of `WritablePropertyMap`
diff --git a/Heat_method_3/include/CGAL/Heat_method_3/internal/Intrinsic_Delaunay_triangulation_3.h b/Heat_method_3/include/CGAL/Heat_method_3/internal/Intrinsic_Delaunay_triangulation_3.h
index 92cdef2e3b9..bbea606cf8b 100644
--- a/Heat_method_3/include/CGAL/Heat_method_3/internal/Intrinsic_Delaunay_triangulation_3.h
+++ b/Heat_method_3/include/CGAL/Heat_method_3/internal/Intrinsic_Delaunay_triangulation_3.h
@@ -335,7 +335,6 @@ private:
         //then go back to top of the stack
       }
     }
-    std::cout<< a << " edges were flipped: " << std::endl;
   }
 
 
diff --git a/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Rich_grid.h b/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Rich_grid.h
index 13101294245..14db499896d 100644
--- a/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Rich_grid.h
+++ b/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Rich_grid.h
@@ -186,15 +186,19 @@ void Rich_grid<Kernel>::init(std::vector<Rich_point<Kernel> > &vert,
 
   radius = _radius;
 
-  x_side = (unsigned int)ceil((bbox.xmax() - bbox.xmin()) / radius);
-  y_side = (unsigned int)ceil((bbox.ymax() - bbox.ymin()) / radius);
-  z_side = (unsigned int)ceil((bbox.zmax() - bbox.zmin()) / radius);
+  std::size_t x_size = (std::size_t)ceil((bbox.xmax() - bbox.xmin()) / radius);
+  std::size_t y_size = (std::size_t)ceil((bbox.ymax() - bbox.ymin()) / radius);
+  std::size_t z_size = (std::size_t)ceil((bbox.zmax() - bbox.zmin()) / radius);
 
-  x_side = (x_side > 0) ? x_side : 1;
-  y_side = (y_side > 0) ? y_side : 1;
-  z_side = (z_side > 0) ? z_side : 1;
+  x_size = (x_size > 0) ? x_size : 1;
+  y_size = (y_size > 0) ? y_size : 1;
+  z_size = (z_size > 0) ? z_size : 1;
 
-  indices.resize(x_side * y_side * z_side + 1, -1);
+  indices.resize(x_size * y_size * z_size + 1, -1);
+
+  x_side = int(x_size);
+  y_side = int(y_size);
+  z_side = int(z_size);
 
   std::sort(rich_points.begin(), rich_points.end(), Z_Sort<Kernel>());
 
diff --git a/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h b/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
index 8090be04983..00d7d30e9bc 100644
--- a/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
+++ b/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
@@ -379,7 +379,7 @@ edge_aware_upsample_point_set(
 
   // copy rich point set
   std::vector<Rich_point> rich_point_set(number_of_input);
-  CGAL::Bbox_3 bbox(0., 0., 0., 0., 0., 0.);
+  CGAL::Bbox_3 bbox;
 
   typename PointRange::const_iterator it = begin; // point iterator
   for(unsigned int i = 0; it != end; ++it, ++i)