More fixes for s3 upload.