Fixing some routing code turds.