More changes for Amazon S3 Config