S3 upload fixes, support for ACL and target folder