Upload S3
Fix some