S3 uploading and encoder fixes