diff --git a/CGAL_Core/include/CGAL/CORE/BigInt.h b/CGAL_Core/include/CGAL/CORE/BigInt.h
index dc376906f02..a66de01839e 100644
--- a/CGAL_Core/include/CGAL/CORE/BigInt.h
+++ b/CGAL_Core/include/CGAL/CORE/BigInt.h
@@ -55,12 +55,12 @@ inline int set_str(BigInt& a, const char* s) {
 
   /// longValue
 inline long longValue(const BigInt& a) {
-  return a.convert_to<long>();;
+  return a.convert_to<long>();
 }
 
   /// doubleValue
 inline double doubleValue(const BigInt& a) {
-  return a.convert_to<double>();;
+  return a.convert_to<double>();
 }
 
   /// isEven
diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
index 5f54f9aad34..0ebd009ac8d 100644
--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
@@ -138,7 +138,7 @@ foreach(comp ${CGAL_FIND_COMPONENTS})
     message(FATAL_ERROR "The requested CGAL component ${comp} does not exist!")
   endif()
   if(comp MATCHES "Core" AND CGAL_DO_NOT_USE_BOOST_MP)
-    message("CGAL_Core needs Boost multiprecision support and won't be used.")
+    message(STATUS "CGAL_Core needs Boost multiprecision support and won't be used.")
   else()
     list(APPEND CGAL_LIBRARIES CGAL_${comp})
   endif()
diff --git a/Number_types/test/Number_types/CMakeLists.txt b/Number_types/test/Number_types/CMakeLists.txt
index b3dd989c766..5496946fb28 100644
--- a/Number_types/test/Number_types/CMakeLists.txt
+++ b/Number_types/test/Number_types/CMakeLists.txt
@@ -13,10 +13,6 @@ include_directories(BEFORE include)
 create_single_source_cgal_program("bench_interval.cpp")
 create_single_source_cgal_program("cpp_float.cpp")
 create_single_source_cgal_program("constant.cpp")
-create_single_source_cgal_program("CORE_BigFloat.cpp")
-create_single_source_cgal_program("CORE_BigInt.cpp")
-create_single_source_cgal_program("CORE_BigRat.cpp")
-create_single_source_cgal_program("CORE_Expr.cpp")
 create_single_source_cgal_program("Counted_number.cpp")
 create_single_source_cgal_program("double.cpp")
 create_single_source_cgal_program("doubletst.cpp")
@@ -66,14 +62,17 @@ create_single_source_cgal_program("utilities.cpp")
 create_single_source_cgal_program("Exact_rational.cpp")
 create_single_source_cgal_program("Mpzf_new.cpp")
 
-find_package( GMP )
-if( GMP_FOUND AND NOT CGAL_DISABLE_GMP )
+if( CGAL_CORE_FOUND )
   create_single_source_cgal_program( "CORE_Expr_ticket_4296.cpp" )
+  create_single_source_cgal_program("CORE_BigFloat.cpp")
+  create_single_source_cgal_program("CORE_BigInt.cpp")
+  create_single_source_cgal_program("CORE_BigRat.cpp")
+  create_single_source_cgal_program("CORE_Expr.cpp")
   find_package(MPFI QUIET)
   if( MPFI_FOUND )
     include( ${MPFI_USE_FILE} )
   endif() #MPFI_FOUND
-endif() #GMP_FOUND AND NOT CGAL_DISABLE_GMP
+endif() #CGAL_CORE_FOUND
 
 if(NOT CGAL_DISABLE_GMP)
   create_single_source_cgal_program( "Gmpfi.cpp" )
diff --git a/Number_types/test/Number_types/utilities.cpp b/Number_types/test/Number_types/utilities.cpp
index 48400c97520..e716624ffae 100644
--- a/Number_types/test/Number_types/utilities.cpp
+++ b/Number_types/test/Number_types/utilities.cpp
@@ -5,7 +5,10 @@
 #include <CGAL/Lazy_exact_nt.h>
 #include <CGAL/Interval_nt.h>
 #include <CGAL/Sqrt_extension.h>
+
+#ifdef CGAL_USE_BOOST_MP
 #include <CGAL/boost_mp.h>
+#endif
 
 #ifdef CGAL_USE_GMP
 #include <CGAL/Gmpz.h>