Final changes for AWS.