Fix up the on_move* events