Minor bugs solved