diff --git a/Orthtree/examples/Orthtree/octree_build_from_point_vector.cpp b/Orthtree/examples/Orthtree/octree_build_from_point_vector.cpp
index 754fcaa3553..1081e155df3 100644
--- a/Orthtree/examples/Orthtree/octree_build_from_point_vector.cpp
+++ b/Orthtree/examples/Orthtree/octree_build_from_point_vector.cpp
@@ -23,7 +23,7 @@ int main() {
   points.emplace_back(-1, 1, 1);
 
   // Create an octree from the points
-  Octree octree({points});
+  Octree octree(points);
 
   // Build the octree
   octree.refine(10, 1);
diff --git a/Orthtree/examples/Orthtree/octree_grade.cpp b/Orthtree/examples/Orthtree/octree_grade.cpp
index ae41079ea87..5bb410d7e33 100644
--- a/Orthtree/examples/Orthtree/octree_grade.cpp
+++ b/Orthtree/examples/Orthtree/octree_grade.cpp
@@ -30,7 +30,7 @@ int main() {
   points.emplace_back(-1.0001, 1, 1);
 
   // Create an octree from the points
-  Octree octree({points});
+  Octree octree(points);
 
   // Build the octree with a small bucket size, so we get a deep node
   octree.refine(10, 2);
diff --git a/Orthtree/examples/Orthtree/quadtree_build_from_point_vector.cpp b/Orthtree/examples/Orthtree/quadtree_build_from_point_vector.cpp
index 45a9b2a80f5..bd40ace0423 100644
--- a/Orthtree/examples/Orthtree/quadtree_build_from_point_vector.cpp
+++ b/Orthtree/examples/Orthtree/quadtree_build_from_point_vector.cpp
@@ -18,7 +18,7 @@ int main()
     points_2d.emplace_back(r.get_double(-1., 1.),
                            r.get_double(-1., 1.));
 
-  Quadtree quadtree({points_2d});
+  Quadtree quadtree(points_2d);
   quadtree.refine(10, 5);
 
   return EXIT_SUCCESS;
diff --git a/Property_map/include/CGAL/Property_container.h b/Property_map/include/CGAL/Property_container.h
index 35887a1ee43..83d6e81cde2 100644
--- a/Property_map/include/CGAL/Property_container.h
+++ b/Property_map/include/CGAL/Property_container.h
@@ -106,7 +106,7 @@ public:
   }
 
   virtual void move(Property_array_base<Index>&& other_base) override {
-    auto&& other = dynamic_cast<Property_array<Index, T>&&>(other_base);
+    auto&& other = static_cast<Property_array<Index, T>&&>(other_base);
     m_data = std::move(other.m_data);
     CGAL_precondition(m_active_indices.size() == m_data.size());
   }
@@ -489,10 +489,13 @@ public:
         [](bool used) { return !used; }
       );
 
+      auto unused_end = unused_begin;
+
       // Determine if the group fits
-      auto unused_end = std::find_if(
-        unused_begin, std::min(unused_begin + n, m_active_indices.end()),
-        [](bool used) { return used; }
+      if (std::distance(unused_begin, m_active_indices.end()) >= n)
+        unused_end = std::find_if(
+          unused_begin, std::min(unused_begin + n, m_active_indices.end()),
+          [](bool used) { return used; }
       );
 
       // If the discovered range was large enough