more ec2 changes