Minor ec2 changes