diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97e67f44..eeaea596 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install" CACHE PATH "CMake install prefix")
 
 cmake_policy(SET CMP0048 NEW)
-project(Serialbox LANGUAGES C CXX VERSION 2.5.0)
+project(Serialbox LANGUAGES C CXX VERSION 2.5.1)
 cmake_minimum_required(VERSION 3.9.0)
 
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -183,7 +183,10 @@ include(IDESupport)
 
 #---------------------------------------- GTest ----------------------------------------------------
 if(SERIALBOX_TESTING)
+  set(tmp_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+  set(BUILD_SHARED_LIBS OFF)
   add_subdirectory(external/googletest)
+  set(BUILD_SHARED_LIBS ${tmp_BUILD_SHARED_LIBS})
 
   if(SERIALBOX_ENABLE_C)
     set(SERIALBOX_HAS_C 1)
diff --git a/tools/cscs-scripts/env_daint.sh b/tools/cscs-scripts/env_daint.sh
index e77ed406..9c3aaa8c 100644
--- a/tools/cscs-scripts/env_daint.sh
+++ b/tools/cscs-scripts/env_daint.sh
@@ -95,6 +95,7 @@ elif [ "$FC_COMPILER" = "pgfortran18.10" ]; then
     FC_COMPILER="pgfortran"
 else
     module swap PrgEnv-cray PrgEnv-gnu
+    module swap gcc gcc/5.3.0
 #    module load cray-netcdf
 #    module load cray-hdf5
 #    export NETCDF_ROOT=${NETCDF_DIR}