Improved upload to s3.