Fix regression issues in copy/paste/delete/move part 2