Various fixes and improvements to cutting and pasting plugins