diff --git a/Inscribed_areas/package_info/Inscribed_areas/license.txt b/Inscribed_areas/package_info/Inscribed_areas/license.txt
index 0d3d7e59728..8bb8efcb72b 100644
--- a/Inscribed_areas/package_info/Inscribed_areas/license.txt
+++ b/Inscribed_areas/package_info/Inscribed_areas/license.txt
@@ -1 +1 @@
-GPL (v3 or later) 
+GPL (v3 or later)
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index c12c568e84c..407d969d9ac 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -988,9 +988,9 @@ You must disable CGAL_ENABLE_CHECK_HEADERS.")
     foreach (package ${CGAL_CONFIGURED_PACKAGES_NAMES})
       if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include)
         set(depends "")
-        file(GLOB ${package}_HEADERS 
+        file(GLOB_RECURSE ${package}_HEADERS 
           RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include" 
-          "${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/CGAL/*.h")
+          "${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/*.h")
         foreach(header ${${package}_HEADERS})
           string(REPLACE "/" "__" header2 "${header}")
           string(REPLACE "." "_" header2 "${header2}")
diff --git a/Intersections_2/test/Intersections_2/test_intersections_2.cpp b/Intersections_2/test/Intersections_2/test_intersections_2.cpp
index 606524f35b0..c128bb5a50d 100644
--- a/Intersections_2/test/Intersections_2/test_intersections_2.cpp
+++ b/Intersections_2/test/Intersections_2/test_intersections_2.cpp
@@ -21,6 +21,10 @@
 #include <iostream>
 #include <cassert>
 
+#ifdef NDEBUG
+#  error The test-suite needs no NDEBUG defined
+#endif
+
 const double epsilon = 0.001;
 
 struct randomint {
diff --git a/Intersections_3/test/Intersections_3/test_intersections_3.cpp b/Intersections_3/test/Intersections_3/test_intersections_3.cpp
index f45790aa32d..36921c8a403 100644
--- a/Intersections_3/test/Intersections_3/test_intersections_3.cpp
+++ b/Intersections_3/test/Intersections_3/test_intersections_3.cpp
@@ -10,6 +10,10 @@
 #include <iostream>
 #include <cassert>
 
+#ifdef NDEBUG
+#  error The test-suite needs no NDEBUG defined
+#endif
+
 const double epsilon = 0.001;
 
 struct randomint {
diff --git a/Mesh_3/include/CGAL/Mesh_3/dihedral_angle_3.h b/Mesh_3/include/CGAL/Mesh_3/dihedral_angle_3.h
index 315d3275090..6e5869a2d0f 100644
--- a/Mesh_3/include/CGAL/Mesh_3/dihedral_angle_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/dihedral_angle_3.h
@@ -57,8 +57,8 @@ dihedral_angle(const typename K::Point_3& a,
 
   const Vector_3 abad = cross_product(ab,ad);
   const double x = CGAL::to_double(scalar_product(cross_product(ab,ac), abad));
-  const double l_ab = CGAL::sqrt(CGAL::to_double(sq_distance(a,b)));
-  const double y = l_ab * CGAL::to_double(scalar_product(ac,abad));
+  const FT l_ab = CGAL::sqrt(sq_distance(a,b));
+  const double y = CGAL::to_double(l_ab * scalar_product(ac,abad));
 
   return FT(std::atan2(y, x) * 180 / CGAL_PI );
 }
diff --git a/Scripts/developer_scripts/cgal_test_with_cmake b/Scripts/developer_scripts/cgal_test_with_cmake
index ee4c8181a01..d888c301401 100755
--- a/Scripts/developer_scripts/cgal_test_with_cmake
+++ b/Scripts/developer_scripts/cgal_test_with_cmake
@@ -13,6 +13,4 @@ fi
 [ ! -x cgal_test_with_cmake ] && echo "No cgal_test_with_cmake in current directory, creating it" && create_cgal_test_with_cmake ${in_demo}
 
 ./cgal_test_with_cmake $@
-RESULT=$?
 cat error.txt
-exit $RESULT
diff --git a/Scripts/developer_scripts/create_cgal_test b/Scripts/developer_scripts/create_cgal_test
index e472be4cc95..706427ac936 100755
--- a/Scripts/developer_scripts/create_cgal_test
+++ b/Scripts/developer_scripts/create_cgal_test
@@ -81,7 +81,6 @@ configure()
   echo "Configuring... "
 
   if eval 'cmake "\$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \\
-                                     -DCMAKE_BUILD_TYPE=Debug  \\
                                      -DCGAL_DIR="\$CGAL_DIR" \\
                                      .' ; then