Vadim Routing fixes