Minor changes to routing.