Few small routing fixes