Reroute fixes