Fixes suggsted by tleek