Changed S3 references.