Some more move/copy fixes