diff --git a/Arrangement_on_surface_2/benchmark/data/benchArrSegments.xml b/Arrangement_on_surface_2/benchmark/data/benchArrSegments.xml
index 994b9ca30dc..67109e375a0 100644
--- a/Arrangement_on_surface_2/benchmark/data/benchArrSegments.xml
+++ b/Arrangement_on_surface_2/benchmark/data/benchArrSegments.xml
@@ -24,18 +24,18 @@
   <class name="cls241" key="increment walk Segments Lazy Simple Cartesian Cgal Gmpq"/>
   <class name="cls242" key="aggregate Segments Lazy Simple Cartesian Cgal Gmpq"/>
   <class name="cls251" key="increment walk Segments Exact Cgal Gmpq"/>
-  <class name="cls252" key="aggregate Segments Exact Cgal Gmpq"/>  
+  <class name="cls252" key="aggregate Segments Exact Cgal Gmpq"/>
   <class name="cls261" key=""/>
   <class name="cls262" key=""/>
   <class name="cls271" key=""/>
-  <class name="cls272" key=""/>  
+  <class name="cls272" key=""/>
 
-  <clo name="verbose" string="--verbose"/> 
-  <clo name="samples" string="--samples"/> 
-  <clo name="print_header" string="--print-header"/> 
-  <clo name="name_length" string="--name-length"/> 
-  <clo name="type_mask" string="--type-mask"/> 
-  <clo name="strategy_mask" string="--strategy-mask"/> 
+  <clo name="verbose" string="--verbose"/>
+  <clo name="samples" string="--samples"/>
+  <clo name="print_header" string="--print-header"/>
+  <clo name="name_length" string="--name-length"/>
+  <clo name="type_mask" string="--type-mask"/>
+  <clo name="strategy_mask" string="--strategy-mask"/>
 
   <file name="eurcut.bff" format="rat" curves="3099"
     vertices="3078" halfedges="6198" faces="39"></file>
@@ -150,7 +150,7 @@
       <benchArrCgalGmpqCartesianSegment print_header="1"/>
       <benchArrCgalGmpqCartesianSegment/>
       <benchArrCgalGmpqLazyCartesianSegment/>
-      <benchArrCgalGmpqLazyCartesianSegment/>
+      <benchArrCgalGmpqLazySimpleCartesianSegment/>
       <benchArrCgalGmpqExactSegment/>
       <benchArrDoubleCartesianSegment enable="false"/>
       <benchArrLazyCgalGmpqCartesianSegment/>
diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
index 86b8f15ece7..0ae8728f90b 100644
--- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
@@ -571,7 +571,7 @@ public:
                           compare_xy_2_object()(p, q, true) != CGAL::EQUAL);
         // check coprimality condition for supporting curves
         _check_pt_arcno_and_coprimality(p, -1, c);
-        _check_pt_arcno_and_coprimality(p, -1, c);
+        _check_pt_arcno_and_coprimality(q, -1, c);
         _fix_curve_ends_order();
     }
 
diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp
index 0707a56039a..38b40217451 100644
--- a/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp
+++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/test_compilation.cpp
@@ -234,7 +234,7 @@ void test()
   gps.oriented_side(pt);
   gps.oriented_side(pgn1);
   gps.oriented_side(pgn_with_holes1);
-  gps.oriented_side(pgn_with_holes1);
+  gps.oriented_side(pgn_with_holes2);
   gps.oriented_side(gps);
   gps.locate(pt, pgn_with_holes1);
 
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/global_functions_spherical_kernel_3.h b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/global_functions_spherical_kernel_3.h
index b135dee42e2..2ed00af62f6 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/CGAL/global_functions_spherical_kernel_3.h
+++ b/Circular_kernel_3/doc/Circular_kernel_3/CGAL/global_functions_spherical_kernel_3.h
@@ -25,7 +25,7 @@ Compares the \f$ \theta\f$-coordinates of `p` and `q` relatively to `sphere`.
 
 \sa \link compare_x_grp `CGAL::compare_x()` \endlink
 \sa \link compare_xy_grp `CGAL::compare_xy()` \endlink
-\sa \link compare_xy_grp `CGAL::compare_xy()` \endlink
+\sa \link compare_xyz_grp `CGAL::compare_xyz()` \endlink
 \sa \link compare_x_at_y_grp `CGAL::compare_x_at_y()` \endlink
 \sa \link compare_y_grp `CGAL::compare_y()` \endlink
 \sa \link compare_yx_grp `CGAL::compare_yx()` \endlink
diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake
index 7ded524d97c..596bc592a15 100644
--- a/Installation/cmake/modules/CGAL_Macros.cmake
+++ b/Installation/cmake/modules/CGAL_Macros.cmake
@@ -16,12 +16,10 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
 
   macro( cache_set var )
     set ( ${var} ${ARGN} CACHE INTERNAL "" )
-    set ( ${var} ${ARGN} CACHE INTERNAL "" )
   endmacro()
 
   macro( typed_cache_set type doc var )
     set ( ${var} ${ARGN} CACHE ${type} ${doc} FORCE )
-    set ( ${var} ${ARGN} CACHE ${type} ${doc} FORCE )
   endmacro()
 
   macro( cache_get var )
diff --git a/Intersections_2/test/Intersections_2/test_intersections_2.cpp b/Intersections_2/test/Intersections_2/test_intersections_2.cpp
index c86e9191539..8219881120d 100644
--- a/Intersections_2/test/Intersections_2/test_intersections_2.cpp
+++ b/Intersections_2/test/Intersections_2/test_intersections_2.cpp
@@ -537,7 +537,7 @@ struct Test
     // point intersection
     check_intersection     (S(p( 0,  -1), p( 10,   0)), R(p(  2,   1), p(  8,  -6)), P(3.42105, -0.657895));
     check_intersection     (S(p( 0,   0), p( 10,   0)), R(p(  1,   6), p(  1,  -3)), P(1, 0));
-    check_intersection     (S(p( 0,   0), p( 10,   0)), R(p(  1,   6), p(  1,  -3)), P(1, 0));
+    check_intersection     (S(p( 0,   0), p( 10,   0)), R(p(  1,   -3), p(  1,  6)), P(1, 0));
     check_intersection     (S(p( 0,   0), p( 10,   0)), R(p(  0,   0), p(-10,   4)), P(0, 0)); // start of ray is exactly on the segment
     check_intersection     (S(p( 0,   0), p( 10,   0)), R(p(  4,   0), p(-10,   4)), P(4, 0)); // start of ray is a segment extremity
 
@@ -757,7 +757,7 @@ struct Test
 
     // segment intersection
     check_intersection<S>  (L(p( 18,  6), p( 0,   0)), Rec(p( 2,  0), p(6,  3)));
-    check_intersection<S>  (L(p( 18,  6), p( 0,   0)), Rec(p( 2,  0), p(6,  3)));
+    check_intersection<S>  (L(p( 0,  0),  p( 18,  6)), Rec(p( 2,  0), p(6,  3)));
     check_intersection<S>  (L(p( 2,  14), p( 2, -14)), Rec(p( 2,  0), p(6,  3)));
     check_intersection<S>  (L(p( 6,   1), p( 6,   2)), Rec(p( 2,  0), p(6,  3)));
     check_intersection<S>  (L(p(-1,   3), p(-2,   3)), Rec(p( 2,  0), p(6,  3)));
diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h
index 367be24d322..d707b4bf9f5 100644
--- a/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h
+++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_new_2.h
@@ -490,7 +490,7 @@ test_new_2(const R& rep)
 
   typename R::Compare_squared_distance_2 compare_sq_dist
         = rep.compare_squared_distance_2_object();
-  tmp34ab = compare_sq_dist(p1,p2,FT(1));
+  tmp34ab = compare_sq_dist(p1, p2, FT(1));
   tmp34ab = compare_sq_dist(p1, l2, FT(1));
   tmp34ab = compare_sq_dist(p2, p1, FT(1));
   tmp34ab = compare_sq_dist(l1, l2, FT(1));
@@ -500,7 +500,7 @@ test_new_2(const R& rep)
   tmp34ab = compare_sq_dist(t2, l1, FT(1));
 
   tmp34ab = CGAL::compare_distance(t2, l1, s1, p1);
-  tmp34ab = CGAL::compare_distance(t2, l1, s1, p1);
+  tmp34ab = CGAL::compare_distance(t2, l1, p1, s1);
   tmp34ab = CGAL::compare_distance(t2, l1, s1);
 
   typename R::Compare_power_distance_2 compare_power_dist