Changed S3 uploader from 'aws/s3' to 's3', due warnings.