Upgrades

More details: email laurentb@nersc.no or geir.evensen@hydro.com.