Minor bugs crept into last update