Fixing routing bugs.