Tweak CopyOut handling