Updates and fixes for ec2 and gce providers