Minor bugs are fixed