More tweaks to make it easier to build PISM.