Fix autoRoute and more