Support spaces in instance names + fix EC2 login issues