More routing fixes