Bunch of bugfixes for the router constructors