Add missing "|| die" and improve mv statements