Some minor improvements to copy items