Minor bugs fixed
(#552)