diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28e855d..d80ba35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
+list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}")
 
 project(CosmoToolbox)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98f752d..408d53b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,7 +76,7 @@ if(YORICK_SUPPORT)
   include_directories(${NETCDF_INCLUDE_PATH} ${NETCDFCPP_INCLUDE_PATH})
 endif(YORICK_SUPPORT)
 if (HDF5_FOUND)
-  set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_CXX_LIBRARIES} ${HDF5_C_LIBRARIES} ${ZLIB})
+  set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_LIBRARIES} ${HDF5_C_LIBRARY} ${ZLIB})
   include_directories(${HDF5_INCLUDE_DIRS})
 endif (HDF5_FOUND)