Fixing S3 issues.