diff --git a/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h b/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h
index 027d7acd5cf..84eb5424dc0 100644
--- a/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h
+++ b/Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h
@@ -485,7 +485,7 @@ public:
     p_vh->set_point(p);
     vertices_of_original_cavity.insert(p_vh);
 
-    // compute facets of the border of the cavity, seen from the
+    // compute facets of the border of the cavity, seen from the exterior
     std::vector<Facet> orig_facets_of_cavity;
     orig_facets_of_cavity.reserve(exterior_border_facets_of_original_cavity.size());
     for(auto f: exterior_border_facets_of_original_cavity) {
@@ -507,6 +507,8 @@ public:
       this->register_facet_to_be_constrained(f);
     }
 
+    visitor.process_cells_in_conflict(cells_of_cavity.begin(), cells_of_cavity.end());
+
     typename T_3::Vertex_triple_Facet_map outer_map;
     for(auto f: facets_of_cavity) {
       typename T_3::Vertex_triple vt = this->make_vertex_triple(f);
@@ -533,7 +535,6 @@ public:
       }
     }
 
-    visitor.process_cells_in_conflict(cells_of_cavity.begin(), cells_of_cavity.end());
     for(auto c: cells_of_cavity) {
       this->tds().delete_cell(c);
     }
diff --git a/Triangulation_3/include/CGAL/cdt_debug_io.h b/Triangulation_3/include/CGAL/cdt_debug_io.h
index 8b00bfd849c..ce4ad2384b2 100644
--- a/Triangulation_3/include/CGAL/cdt_debug_io.h
+++ b/Triangulation_3/include/CGAL/cdt_debug_io.h
@@ -40,7 +40,8 @@ namespace CGAL {
     std::vector<std::array<std::size_t, 3>> facets;
     facets.reserve(size);
 
-    for(std::size_t i = 0; const auto& [cell, facet_index] : facets_range) {
+    std::size_t i = 0;
+    for(const auto& [cell, facet_index] : facets_range) {
       const auto v0 = cell->vertex(Tr::vertex_triple_index(facet_index, 0));
       const auto v1 = cell->vertex(Tr::vertex_triple_index(facet_index, 1));
       const auto v2 = cell->vertex(Tr::vertex_triple_index(facet_index, 2));