Fix s3 uploads II