Merge geoff's hotfixes