Some routing bugs fixed.