Fix routing
Some more path independence