Ec2 classic fixes