Fix batch moves/deletions