Fix spaces and Windows 7