Further tweaks to S3 uploads