Amazon S3 support now works properly