Some routing fixes