Small fixes in Route