Better handling of mv.