Fix some issues with using an OS user that does not have ec2 creds