More minor routing fixes.