Fix small problems: spaces etc.