specific fixes to copy smarter with s3