Fix rewrite rules for the data mover