Fix up issues mpdehaan raised