More routing fixes

Rolling pull request for RC 4.