More IAM EC2 modifications