several adjustment from ec2