Fixes more issues with EtherSwitch router.