Ec2 updates

set of minor changes needed to get aws-ec2 passing 100% on live tests