Various routing fixes