Minor routing tweaks