more routing fixes