diff --git a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/K_means_clustering.h b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/K_means_clustering.h
index 725d37a5741..b367e4064cb 100644
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/K_means_clustering.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/K_means_clustering.h
@@ -148,8 +148,9 @@ class K_means_point
 public:
   double data;      /**< Location of the point */
   std::size_t    center_id; /**< Closest center to the point */
-  K_means_point(double data, std::size_t center_id = -1) : data(data),
-    center_id(center_id) {
+  K_means_point(double data,
+                std::size_t center_id = (std::numeric_limits<std::size_t>::max)())
+    : data(data), center_id(center_id) {
   }
 
   operator double() const {
diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/K_means_clustering_test_2.cpp b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/K_means_clustering_test_2.cpp
index 907c05955b4..5a84ebbfb2f 100644
--- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/K_means_clustering_test_2.cpp
+++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/K_means_clustering_test_2.cpp
@@ -20,7 +20,7 @@ int main(void)
       // unique point generate
       std::vector<double> points;
       for(std::size_t i = 0; i < center_size; ++i) {
-        points.push_back(i);
+        points.push_back(static_cast<double>(i));
       }
 
       // test kmeans, expected result: each point has its own cluster