Minor bugs resolved