More Routing behaviour tweaks