Fixes in EC2 and bootstrap commands