More polishing on cut/copy