Minor bugs fixed.