diff --git a/CMakeLists.txt b/CMakeLists.txt
index 109b8476..10c13b98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
 # Start configuration
 cmake_minimum_required(VERSION 2.8.12)
 project(app4triqs CXX)
+if(POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)
+endif()
 
 # Default to Release build type
 if(NOT CMAKE_BUILD_TYPE)
@@ -51,7 +54,7 @@ endif()
 
 # Tests
 option(Build_Tests "Build tests" ON)
-if(${Build_Tests})
+if(Build_Tests)
   enable_testing()
   add_subdirectory(test)
 endif()
@@ -60,10 +63,11 @@ endif()
 add_subdirectory(share)
 
 option(Build_Documentation "Build documentation" OFF)
-if(${Build_Documentation})
-  if(NOT ${TRIQS_WITH_DOCUMENTATION})
-    message("Error: TRIQS library has not been compiled with its documentation")
+if(Build_Documentation)
+  if(NOT TRIQS_WITH_DOCUMENTATION)
+    message(WARNING "TRIQS library has not been compiled with its documentation! Cannot build documentation.")
   else()
+    message(STATUS "Documentation Build enabled")
     add_subdirectory(doc)
   endif()
 endif()
diff --git a/share/cmake/Findlibasan_rt.cmake b/share/cmake/Findlibasan_rt.cmake
index 60828a3a..919375ee 100644
--- a/share/cmake/Findlibasan_rt.cmake
+++ b/share/cmake/Findlibasan_rt.cmake
@@ -28,7 +28,7 @@ find_library(ASAN_RT_LIBRARY
   NAMES ${name}
   PATHS
     ENV LIBRARY_PATH
-    ENV LD_INCLUDE_PATH
+    ENV LD_LIBRARY_PATH
     /usr/lib 
     /usr/local/lib
     /usr/lib/gcc/*/7
diff --git a/share/cmake/Findlibubsan_rt.cmake b/share/cmake/Findlibubsan_rt.cmake
index 8b6dc7e5..d8a14d1b 100644
--- a/share/cmake/Findlibubsan_rt.cmake
+++ b/share/cmake/Findlibubsan_rt.cmake
@@ -19,7 +19,7 @@
 
 set(TRIAL_PATHS
   ENV LIBRARY_PATH
-  ENV LD_INCLUDE_PATH
+  ENV LD_LIBRARY_PATH
   /usr/lib
   /usr/local/lib
   /usr/lib/gcc/7/*