Emergency patch of a few bugs that slept into last commit