More various routing fixes