diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
index 3da43a5..ff802dc 100644
--- a/cmake/FindNetCDF.cmake
+++ b/cmake/FindNetCDF.cmake
@@ -57,7 +57,7 @@
 
 ## Library names for each component
 set( NetCDF_C_LIBRARY_NAME          netcdf )
-set( NetCDF_CXX_LIBRARY_NAME        netcdf_c++4 )
+set( NetCDF_CXX_LIBRARY_NAME        netcdf_c++4 netcdf-cxx4 )
 set( NetCDF_CXX_LEGACY_LIBRARY_NAME netcdf_c++ )
 set( NetCDF_Fortran_LIBRARY_NAME    netcdff )
 
@@ -120,7 +120,7 @@
   find_library(NetCDF_${_comp}_LIBRARY
     NAMES ${NetCDF_${_comp}_LIBRARY_NAME}
     DOC "netcdf ${_comp} library"
-    HINTS ${_search_hints}
+    HINTS ${_search_hints_${_comp}} ${_search_hints}
     PATH_SUFFIXES lib ../../lib
   )
   mark_as_advanced(NetCDF_${_comp}_LIBRARY)
diff --git a/cmake/VERSION b/cmake/VERSION
index 7c69a55..a76ccff 100644
--- a/cmake/VERSION
+++ b/cmake/VERSION
@@ -1 +1 @@
-3.7.0
+3.7.1
diff --git a/cmake/compiler_flags/GNU_Fortran.cmake b/cmake/compiler_flags/GNU_Fortran.cmake
index ddff91b..d1f1462 100644
--- a/cmake/compiler_flags/GNU_Fortran.cmake
+++ b/cmake/compiler_flags/GNU_Fortran.cmake
@@ -7,7 +7,7 @@
 # nor does it submit to any jurisdiction.
 
 set( CMAKE_Fortran_FLAGS_RELEASE        "-O3 -DNDEBUG -funroll-all-loops -finline-functions" CACHE STRING "Fortran compiler flags for Release builds"          FORCE )
-set( CMAKE_Fortran_FLAGS_BIT            "-O2 -DNDEBUG -fno-range-check -fconvert=big-endian" CACHE STRING "Fortran compiler flags for Bit-reproducible builds" FORCE )
+set( CMAKE_Fortran_FLAGS_BIT            "-O2 -DNDEBUG -fno-range-check"                      CACHE STRING "Fortran compiler flags for Bit-reproducible builds" FORCE )
 set( CMAKE_Fortran_FLAGS_DEBUG          "-O0 -g -fcheck=bounds -fbacktrace -finit-real=snan" CACHE STRING "Fortran compiler flags for Debug builds"            FORCE )
 set( CMAKE_Fortran_FLAGS_PRODUCTION     "-O2 -g"                                             CACHE STRING "Fortran compiler flags for Production builds."      FORCE )
 set( CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG"                                    CACHE STRING "Fortran compiler flags for RelWithDebInfo builds."  FORCE )
diff --git a/tests/ecbuild_add_flags/test_ecbuild_add_flags.cmake b/tests/ecbuild_add_flags/test_ecbuild_add_flags.cmake
index e468e91..595671b 100644
--- a/tests/ecbuild_add_flags/test_ecbuild_add_flags.cmake
+++ b/tests/ecbuild_add_flags/test_ecbuild_add_flags.cmake
@@ -46,7 +46,7 @@
 if( CMAKE_C_FLAGS MATCHES "-fooxxx" )
   message(FATAL_ERROR "Flag -fooxxx wrongly added" )
 else()
-  message("Successfully skiped addition of fake C flag -fooxxx")
+  message("Successfully skipped addition of fake C flag -fooxxx")
 endif()
 
 if( CMAKE_CXX_FLAGS MATCHES "-O1" )
@@ -55,8 +55,8 @@
   message(FATAL_ERROR "Failed to add CXX flag -O1" )
 endif()
 
-if( CMAKE_CXX_FLAGS MATCHES "-barxxx" )
-  message(FATAL_ERROR "Flag -barxxx wrongly added" )
+if( CMAKE_CXX_FLAGS MATCHES "-fantasyflag" )
+  message(FATAL_ERROR "Flag -fantasyflag wrongly added" )
 else()
-  message("Successfully skiped addition of fake CXX flag -barxxx")
+  message("Successfully skipped addition of fake CXX flag -fantasyflag")
 endif()