Minor changes to the routing