Additional routing fixes