More minor changes to router.