A few small buxfixes due to the route changes.