Routing validation fixes