A few routing fixes