General bits of the sprint specific fixes to copy plugin.