- More router tweaks