Changed handling of Roads vs Intersections