Updated defaults for EC2