Numerous fixes for routing.