diff --git a/Installation/cmake/modules/FindBLAS.cmake b/Installation/cmake/modules/FindBLAS.cmake
index 73693eb0595..321b271b10e 100644
--- a/Installation/cmake/modules/FindBLAS.cmake
+++ b/Installation/cmake/modules/FindBLAS.cmake
@@ -401,15 +401,5 @@ else(BLAS_LIBRARIES_DIR OR BLAS_LIBRARIES)
     endif(BLAS_FOUND)
   endif(NOT BLAS_FIND_QUIETLY)
 
-  #message("DEBUG: BLAS_DEFINITIONS = ${BLAS_DEFINITIONS}")
-  #message("DEBUG: BLAS_LINKER_FLAGS = ${BLAS_LINKER_FLAGS}")
-  #message("DEBUG: BLAS_LIBRARIES = ${BLAS_LIBRARIES}")
-  #message("DEBUG: BLAS_LIBRARIES_DIR = ${BLAS_LIBRARIES_DIR}")
-  #message("DEBUG: BLAS_FOUND = ${BLAS_FOUND}")
-
 endif(BLAS_LIBRARIES_DIR OR BLAS_LIBRARIES)
 
-#mark_as_advanced(BLAS_DEFINITIONS)
-#mark_as_advanced(BLAS_LINKER_FLAGS)
-#mark_as_advanced(BLAS_LIBRARIES)
-#mark_as_advanced(BLAS_LIBRARIES_DIR)
diff --git a/Installation/cmake/modules/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake
index 0703bb4ecfc..6a87444fe4e 100644
--- a/Installation/cmake/modules/FindGMP.cmake
+++ b/Installation/cmake/modules/FindGMP.cmake
@@ -59,7 +59,3 @@ else()
   find_package_handle_standard_args(GMP "DEFAULT_MSG" GMP_INCLUDE_DIR GMP_LIBRARIES_DIR)
   
 endif()
-
-#mark_as_advanced(GMP_INCLUDE_DIR)
-#mark_as_advanced(GMP_LIBRARIES)
-#mark_as_advanced(GMP_LIBRARIES_DIR)
diff --git a/Installation/cmake/modules/FindLAPACK.cmake b/Installation/cmake/modules/FindLAPACK.cmake
index 1c46312194b..9082530bd07 100644
--- a/Installation/cmake/modules/FindLAPACK.cmake
+++ b/Installation/cmake/modules/FindLAPACK.cmake
@@ -262,15 +262,5 @@ else(LAPACK_LIBRARIES_DIR OR LAPACK_LIBRARIES)
     endif(LAPACK_FOUND)
   endif(NOT LAPACK_FIND_QUIETLY)
 
-  #message("DEBUG: LAPACK_DEFINITIONS = ${LAPACK_DEFINITIONS}")
-  #message("DEBUG: LAPACK_LINKER_FLAGS = ${LAPACK_LINKER_FLAGS}")
-  #message("DEBUG: LAPACK_LIBRARIES = ${LAPACK_LIBRARIES}")
-  #message("DEBUG: LAPACK_LIBRARIES_DIR = ${LAPACK_LIBRARIES_DIR}")
-  #message("DEBUG: LAPACK_FOUND = ${LAPACK_FOUND}")
-
 endif(LAPACK_LIBRARIES_DIR OR LAPACK_LIBRARIES)
 
-#mark_as_advanced(LAPACK_DEFINITIONS)
-#mark_as_advanced(LAPACK_LINKER_FLAGS)
-#mark_as_advanced(LAPACK_LIBRARIES)
-#mark_as_advanced(LAPACK_LIBRARIES_DIR)
diff --git a/Installation/cmake/modules/FindLEDA.cmake b/Installation/cmake/modules/FindLEDA.cmake
index a02923493d7..c8d3ebea136 100644
--- a/Installation/cmake/modules/FindLEDA.cmake
+++ b/Installation/cmake/modules/FindLEDA.cmake
@@ -27,6 +27,14 @@ else()
     set( LEDA_DEFINITIONS "$ENV{LEDA_DEFINITIONS}" CACHE STRING   "Definitions for the LEDA library" FORCE )
   endif()  
   
+  if ( NOT LEDA_CXX_FLAGS )
+    set( LEDA_CXX_FLAGS "$ENV{LEDA_CXX_FLAGS}" CACHE STRING   "Compiler flags for the LEDA library" FORCE )
+  endif()  
+  
+  if ( NOT LEDA_LINERFLAGS )
+    set( LEDA_LINKER_FLAGS "$ENV{LEDA_LINKER_FLAGS}" CACHE STRING   "Linker flags for the LEDA library" FORCE )
+  endif()  
+  
   if ( NOT "$ENV{LEDA_VERSION}" STREQUAL "" )
     set( CGAL_LEDA_VERSION "$ENV{LEDA_VERSION}" CACHE STRING   "The version of the LEDA library" FORCE )
   endif()
diff --git a/Installation/cmake/modules/FindMPFR.cmake b/Installation/cmake/modules/FindMPFR.cmake
index da84fc57c0a..ab0f0f802e5 100644
--- a/Installation/cmake/modules/FindMPFR.cmake
+++ b/Installation/cmake/modules/FindMPFR.cmake
@@ -60,6 +60,3 @@ else()
   
 endif()
 
-#mark_as_advanced(MPFR_INCLUDE_DIR)
-#mark_as_advanced(MPFR_LIBRARIES)
-#mark_as_advanced(MPFR_LIBRARIES_DIR)