Minor bugs'