Fix path and route problems