Tweaks to copy