fixes for ec2