Copy tweaks and fixes