diff --git a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
index 00b32c5e4925100bc9ca1b0897cc7b389a8bf8ef..d79201a49a88446d19c9d6af9420d58c2e55ebc5 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
@@ -88,11 +88,11 @@ int main(int argc, char *argv[])
 
 #ifdef OGS_BUILD_INFO
 	INFO("%s was build with compiler %s", argv[0], CMAKE_CXX_COMPILER);
-	if (std::string(CMAKE_BUILD_TYPE).compare("Release") == 0) {
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
-	} else {
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
-	}
+#ifdef NDEBUG
+	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
+#else
+	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
+#endif
 #endif
 
 #ifdef UNIX
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
index 67bb8a91b6891f6af9599c32c5d08bd7be4c0579..6bf7fc4167eada85217e1444a8adadf530fc509f 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
@@ -94,11 +94,11 @@ int main(int argc, char *argv[])
 
 #ifdef OGS_BUILD_INFO
 	INFO("%s was build with compiler %s", argv[0], CMAKE_CXX_COMPILER);
-	if (std::string(CMAKE_BUILD_TYPE).compare("Release") == 0) {
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
-	} else {
-		INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
-	}
+#ifdef NDEBUG
+	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_RELEASE);
+#else
+	INFO("CXX_FLAGS: %s %s", CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG);
+#endif
 #endif
 
 #ifdef UNIX
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index ad78fb5bff119145a6ae8878bf6676ba540eca06..56b2f2af818176a89c6bb07e7f9b34ad1babbe12 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -8,6 +8,7 @@ FIND_PATH(OGS_LIBS_DIR_FOUND geotiff.lib
 	PATH_SUFFIXES libgeotiff)
 IF(OGS_LIBS_DIR_FOUND)
 	SET(OGS_LIBS_DIR ${OGS_LIBS_DIR_FOUND}/..)
+ENDIF()
 
 ######################
 ### Find tools     ###
@@ -71,7 +72,7 @@ FIND_PACKAGE ( LAPACK )
 
 ## VTK ##
 IF (OGS_LIBS_DIR_FOUND)
-	SET (VTK_DIR ${OGS_LIBS_DIR_FOUND}/VTK/build)
+	SET (VTK_DIR ${OGS_LIBS_DIR}/VTK/build)
 ENDIF () # OGS_LIBS_DIR_FOUND
 IF(NOT OGS_DONT_USE_VTK)
 	FIND_PACKAGE( VTK )
diff --git a/scripts/cmake/FindLibGeoTiff.cmake b/scripts/cmake/FindLibGeoTiff.cmake
index 1c2934a16c5f86f2b78ac013d30b2076ab651b04..0d3e368d2609a7752b628600c2115ef01987ebc1 100644
--- a/scripts/cmake/FindLibGeoTiff.cmake
+++ b/scripts/cmake/FindLibGeoTiff.cmake
@@ -17,7 +17,7 @@ if (NOT libgeotiff_FOUND)
 				/usr/include/geotiff
 				${CMAKE_SOURCE_DIR}/../Libs/libgeotiff
 				$ENV{OGS_LIBS}/libgeotiff
-				${OGS_LIBS_DIR_FOUND}/libgeotiff
+				${OGS_LIBS_DIR}/libgeotiff
 			)
 
 	find_library(libgeotiff_LIBRARIES
@@ -27,7 +27,7 @@ if (NOT libgeotiff_FOUND)
 			/usr/lib
 			${CMAKE_SOURCE_DIR}/../Libs/libgeotiff
 			$ENV{OGS_LIBS}/libgeotiff
-			${OGS_LIBS_DIR_FOUND}/libgeotiff
+			${OGS_LIBS_DIR}/libgeotiff
 		)
 
 
diff --git a/scripts/cmake/FindLibTiff.cmake b/scripts/cmake/FindLibTiff.cmake
index 25014a26913e3f3cf2561b03cc5a51ee64da8d5f..47ec875f4f656cd5ac550b50a7d24d88d82d710c 100644
--- a/scripts/cmake/FindLibTiff.cmake
+++ b/scripts/cmake/FindLibTiff.cmake
@@ -15,7 +15,7 @@ if (NOT libtiff_FOUND)
 			/usr/include
 			${CMAKE_SOURCE_DIR}/../Libs/libtiff/libtiff
 			$ENV{OGS_LIBS}/libtiff
-			${OGS_LIBS_DIR_FOUND}/libtiff/libtiff
+			${OGS_LIBS_DIR}/libtiff/libtiff
 		)
 
 	if ( UNIX )
@@ -25,7 +25,7 @@ if (NOT libtiff_FOUND)
 				/usr/lib64
 				/usr/lib
 				${CMAKE_SOURCE_DIR}/../Libs/libtiff/libtiff
-				${OGS_LIBS_DIR_FOUND}/libtiff/libtiff
+				${OGS_LIBS_DIR}/libtiff/libtiff
 			)
 	else ( UNIX )
 		find_library(libtiff_LIBRARIES
@@ -33,7 +33,7 @@ if (NOT libtiff_FOUND)
 			PATHS
 				${CMAKE_SOURCE_DIR}/../Libs/libtiff/libtiff
 				$ENV{OGS_LIBS}/libtiff
-				${OGS_LIBS_DIR_FOUND}/libtiff
+				${OGS_LIBS_DIR}/libtiff
 			)
 	endif ( UNIX )
 
diff --git a/scripts/cmake/FindShapelib.cmake b/scripts/cmake/FindShapelib.cmake
index 3db1320ad127a394ff76530dc31d7634468d128c..8c41e9368d4820b990067fc53444fb5a5de7f98b 100644
--- a/scripts/cmake/FindShapelib.cmake
+++ b/scripts/cmake/FindShapelib.cmake
@@ -13,7 +13,7 @@ if (NOT Shapelib_FOUND)
 		${CMAKE_SOURCE_DIR}/../Libs/shapelib
 		C:/OGS_Libs/shapelib
 		$ENV{OGS_LIBS}/shapelib
-		${OGS_LIBS_DIR_FOUND}/shapelib
+		${OGS_LIBS_DIR}/shapelib
 	)
 
 	find_path( Shapelib_INCLUDE_DIR