Small tweaks in do_move and friends