Move and copy fixes