Fixes to the route validator