various routing fixes