Minor bugs squashed