Minor bugs fixed...