Minor bugs correction.