Fixes to routing.