diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6453bb..dcc5c4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 project (GLINT2)
 enable_language(Fortran)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 list (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 include (setup_rpath)
diff --git a/slib/icebin/GridSpec.cpp b/slib/icebin/GridSpec.cpp
index 137339b..65a2e35 100644
--- a/slib/icebin/GridSpec.cpp
+++ b/slib/icebin/GridSpec.cpp
@@ -1,5 +1,6 @@
 #include <icebin/GridSpec.hpp>
 #include <ibmisc/netcdf.hpp>
+#include <algorithm>
 
 using namespace netCDF;
 using namespace ibmisc;
diff --git a/slib/icebin/contracts/modele_pism.cpp b/slib/icebin/contracts/modele_pism.cpp
index e71442d..eccf107 100644
--- a/slib/icebin/contracts/modele_pism.cpp
+++ b/slib/icebin/contracts/modele_pism.cpp
@@ -18,7 +18,7 @@
 
 #include <mpi.h>        // Must be first
 #include <limits>
-#include <pism/base/enthalpyConverter.hh>
+#include <pism/enthalpyConverter.hh>
 #include <ibmisc/VarTransformer.hpp>
 #include <icebin/contracts/contracts.hpp>
 #include <icebin/modele/GCMCoupler_ModelE.hpp>
diff --git a/slib/icebin/modele/GCMCoupler_ModelE.cpp b/slib/icebin/modele/GCMCoupler_ModelE.cpp
index 4e86352..91899c3 100644
--- a/slib/icebin/modele/GCMCoupler_ModelE.cpp
+++ b/slib/icebin/modele/GCMCoupler_ModelE.cpp
@@ -1278,7 +1278,7 @@ bool run_ice)    // if false, only initialize
 {
     printf("BEGIN GCMCoupler_ModelE::couple()\n");
     // Call superclass coupling for starters
-    printf("GCMCoupler_ModelE::couple time_s = %dg run_ice=%c \n",time_s, run_ice);
+    printf("GCMCoupler_ModelE::couple time_s = %d run_ice=%d \n",time_s, run_ice);
     GCMInput out(this->GCMCoupler::couple(time_s, gcm_ovalsE, run_ice));
     printf("Returned from GCMCoupler_ModelE::couple \n");
 
diff --git a/slib/icebin/pism/IceCoupler_PISM.cpp b/slib/icebin/pism/IceCoupler_PISM.cpp
index 42fb891..1b896ee 100644
--- a/slib/icebin/pism/IceCoupler_PISM.cpp
+++ b/slib/icebin/pism/IceCoupler_PISM.cpp
@@ -26,8 +26,8 @@
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 
-#include <pism/base/stressbalance/PISMStressBalance.hh>
-#include <pism/earth/PISMBedDef.hh>
+#include <pism/stressbalance/StressBalance.hh>
+#include <pism/earth/BedDef.hh>
 
 #include <ibmisc/netcdf.hpp>
 #include <ibmisc/ibmisc.hpp>
diff --git a/slib/icebin/pism/IceCoupler_PISM.hpp b/slib/icebin/pism/IceCoupler_PISM.hpp
index 41772ad..4e32d85 100644
--- a/slib/icebin/pism/IceCoupler_PISM.hpp
+++ b/slib/icebin/pism/IceCoupler_PISM.hpp
@@ -22,23 +22,23 @@
 // PISM Includes... want to be included first
 #include <petsc.h>
 #include <petscvec.h>
-#include <pism/base/util/Context.hh>
-#include <pism/base/util/IceGrid.hh>
-#include <pism/base/util/iceModelVec.hh>
-#include <pism/base/iceModel.hh>
+#include <pism/util/Context.hh>
+#include <pism/util/IceGrid.hh>
+#include <pism/util/iceModelVec.hh>
+#include <pism/icemodel/IceModel.hh>
 
-#include <pism/base/util/pism_options.hh>
-#include <pism/coupler/atmosphere/PAFactory.hh>
-#include <pism/coupler/ocean/POFactory.hh>
-#include <pism/coupler/surface/PSFactory.hh>
+#include <pism/util/pism_options.hh>
+#include <pism/coupler/atmosphere/Factory.hh>
+#include <pism/coupler/ocean/Factory.hh>
+#include <pism/coupler/surface/Factory.hh>
 
-#include <pism/base/util/PISMTime.hh>
+#include <pism/util/Time.hh>
 
 #include <pism/icebin/IBIceModel.hh>
 #include <pism/icebin/VecBundleWriter.hh>
 #include <pism/icebin/IBSurfaceModel.hh>
-#include <pism/base/util/petscwrappers/PetscInitializer.hh>
-#include <pism/base/util/petscwrappers/Vec.hh>
+#include <pism/util/petscwrappers/PetscInitializer.hh>
+#include <pism/util/petscwrappers/Vec.hh>
 // --------------------------------
 #include <mpi.h>
 #include <icebin/GCMCoupler.hpp>