diff --git a/CMakeLists.txt b/CMakeLists.txt
index 551ba66a7b72dada77c568ffc794eb683c06b226..848a5e07bf27b3cfc2817d714732304d882c9000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,8 @@ cmake_policy(SET CMP0074 NEW)
 endif()
 
 # Set compile options
-add_compile_options(-std=c++11 "${OpenMP_CXX_FLAGS}" -Wall -Wl,--no-undefined)
+add_compile_options(-std=c++11 "${OpenMP_CXX_FLAGS}" -Wall)
+string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--no-undefined")
 
 if (NOT CMAKE_BUILD_TYPE MATCHES Debug)
     add_compile_options(-DNDEBUG)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 9ce65a85d13b659028a540c95d386c63478731e2..c20ab45cc8d8c57c69f39403a8c84286e505510c 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -33,8 +33,8 @@ add_library(everybeam SHARED
 )
 
 target_include_directories(everybeam PUBLIC ${CASACORE_INCLUDE_DIR})
-target_link_libraries(everybeam PUBLIC ${CASACORE_LIBRARIES})
 target_link_libraries(everybeam PUBLIC hamaker lobes oskar)
+target_link_libraries(everybeam PUBLIC ${CASACORE_LIBRARIES} ${HDF5_LIBRARIES})
 
 install (
   TARGETS everybeam
diff --git a/cpp/hamaker/CMakeLists.txt b/cpp/hamaker/CMakeLists.txt
index e70febba9af0e7e60abddd80a54b99de9e958e65..744ff1b82f2fc8dc0addf4fd98b15aed78ac1397 100644
--- a/cpp/hamaker/CMakeLists.txt
+++ b/cpp/hamaker/CMakeLists.txt
@@ -5,6 +5,7 @@ include_directories(${CMAKE_BINARY_DIR})
 add_library(hamaker SHARED
   hamakerelementresponse.cc
   hamakercoeff.cc)
+target_link_libraries(hamaker PUBLIC ${HDF5_LIBRARIES})
 string(TOLOWER ${CMAKE_PROJECT_NAME} projectname )
 set_target_properties(hamaker PROPERTIES LIBRARY_OUTPUT_NAME "${projectname}-hamaker")
 
diff --git a/demo/comparison-oskar/main.cpp b/demo/comparison-oskar/main.cpp
index b3e25ac1a8c7f3695f1e74d8de52279ab64a3600..a8ea22d56db518357d00def6a2e52f704dbbd551 100644
--- a/demo/comparison-oskar/main.cpp
+++ b/demo/comparison-oskar/main.cpp
@@ -34,6 +34,6 @@ int main(int argc, char** argv){
         }
     }
 
-    const long unsigned leshape [] = {(long unsigned int) N, N, 2, 2};
+    const long unsigned leshape [] = {(long unsigned int) N, (long unsigned int) N, 2, 2};
     npy::SaveArrayAsNumpy("response.npy", false, 4, leshape, result);
 }
diff --git a/demo/tElementBeamCommon.h b/demo/tElementBeamCommon.h
index f819cdfc96f74a4a657f26141ff231fb1d94ecc2..d8219d6451a433096cbefd2c3ea8f99ece005b0b 100644
--- a/demo/tElementBeamCommon.h
+++ b/demo/tElementBeamCommon.h
@@ -82,9 +82,6 @@ void run(everybeam::ElementResponseModel elementResponseModel, double frequency,
   // Print frequency
   std::clog << "Frequency: " << frequency * 1e-6 << " Mhz" << std::endl;
 
-  // Set number of stations to 1
-  size_t nr_stations = 1;
-
   // Read number of timesteps
   size_t nr_timesteps = ms.nrow();
   std::clog << "Number of timesteps: " << nr_timesteps << std::endl;
@@ -112,7 +109,7 @@ void run(everybeam::ElementResponseModel elementResponseModel, double frequency,
   std::clog << "DEC: " << zenithDec << std::endl;
 
   // Imaging parameters
-  float image_size = M_PI;   // in radians
+  // float image_size = M_PI;   // in radians
   size_t subgrid_size = 32;  // in pixels
 
   // Compute element beams from theta, phi