Fixed issues with spaces rejected by auto-compiler