A couple of routing tweaks