diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3f6d117817746f1d68547d9c52bc8dd89dab794..75f631d31c0ad8c45aed43b656d96c74714a37e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,10 @@ project(openfpm_pdata LANGUAGES C CXX)
 
 enable_testing()
 
+if (POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake_modules/)
 
 set(BOOST_INCLUDE ${Boost_INCLUDE_DIR} CACHE PATH "Include directory for BOOST")
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt
index 3a79afa33ffdb3383967a40ee39b6bb6a9d3dd07..459448ca567a02986e75c38bee633ac498e7bb8d 100644
--- a/images/CMakeLists.txt
+++ b/images/CMakeLists.txt
@@ -55,8 +55,8 @@ target_link_libraries(metis_dec ${MPI_C_LIBRARIES})
 target_link_libraries(dom_box ${Boost_LIBRARIES})
 target_link_libraries(dom_box -L${PARMETIS_ROOT}/lib parmetis)
 target_link_libraries(dom_box -L${METIS_ROOT}/lib metis)
-target_link_libraries(dom_box -L${HDF5_ROOT}/lib hdf5 hdf5_hl)
-#target_link_libraries(dom_box ${HDF5_LIBRARIES})
+#target_link_libraries(dom_box -L${HDF5_ROOT}/lib hdf5 hdf5_hl)
+target_link_libraries(dom_box ${HDF5_LIBRARIES})
 target_link_libraries(dom_box -L${LIBHILBERT_LIBRARY_DIRS} ${LIBHILBERT_LIBRARIES})
 target_link_libraries(dom_box ${MPI_C_LIBRARIES})
 
diff --git a/openfpm_data b/openfpm_data
index 6e1c547e785a6ce03b31dfbfd41d77314a169ecd..151921ecf7d72831724e2a2faed2c1a4ec1b8984 160000
--- a/openfpm_data
+++ b/openfpm_data
@@ -1 +1 @@
-Subproject commit 6e1c547e785a6ce03b31dfbfd41d77314a169ecd
+Subproject commit 151921ecf7d72831724e2a2faed2c1a4ec1b8984
diff --git a/openfpm_devices b/openfpm_devices
index 1a3dfc0a96e4ad8ab61f7f1f7cdc9127ea99041c..1731012c2018b015c60328458e12209ca82d29c5 160000
--- a/openfpm_devices
+++ b/openfpm_devices
@@ -1 +1 @@
-Subproject commit 1a3dfc0a96e4ad8ab61f7f1f7cdc9127ea99041c
+Subproject commit 1731012c2018b015c60328458e12209ca82d29c5
diff --git a/openfpm_numerics b/openfpm_numerics
index 7207e7c4e8d947a565fe0873573eee19c12c86c5..126db301b546386a1b58b3a2315a63c2e472d9e1 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit 7207e7c4e8d947a565fe0873573eee19c12c86c5
+Subproject commit 126db301b546386a1b58b3a2315a63c2e472d9e1
diff --git a/openfpm_vcluster b/openfpm_vcluster
index 23c94dfb18a9b72887f98978afd1bca6ca6acbed..09c23abd2cb87f3392fa2e5ac89349a63196f415 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit 23c94dfb18a9b72887f98978afd1bca6ca6acbed
+Subproject commit 09c23abd2cb87f3392fa2e5ac89349a63196f415
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1498a94d7050b4dbd39ee3ef029170b9e9c3f933..7f92f874498b3e0aaac1ceb21536300c6b8c2bb3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,7 +30,7 @@ if (CUDA_FOUND)
 	target_compile_options(pdata PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
 	target_include_directories (pdata PUBLIC ${MPI_C_INCLUDE_DIRS})
         if (TEST_COVERAGE)
-		target_compile_options(pdata PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage">)
+		target_compile_options(pdata PRIVATE $<$<COMPILE_LANGUAGE:CUDA>: -Xcompiler "-fprofile-arcs -ftest-coverage" >)
         endif()
 endif()