Small fixs for ec2.