minor routing tweaks