Fixes to the routing system.