trivial changes to move_on_copy, others