Amazon S3 fixes