Changes from ec2 testing