Monor tweaks to copy