Resolve a few discrepancies between driver and router.