diff --git a/src/karts/controller/test_ai.hpp b/src/karts/controller/test_ai.hpp
index 8d1ffb277..ff7f73f32 100644
--- a/src/karts/controller/test_ai.hpp
+++ b/src/karts/controller/test_ai.hpp
@@ -66,6 +66,7 @@ namespace irr
  *  stage) identical to the Skidding AI.
 \ingroup controller
 */
+
 class TestAI : public AIBaseLapController
 {
 private:
diff --git a/src/tracks/navmesh.cpp b/src/tracks/navmesh.cpp
index 1da2bc574..74d525add 100644
--- a/src/tracks/navmesh.cpp
+++ b/src/tracks/navmesh.cpp
@@ -95,14 +95,6 @@ NavMesh::NavMesh(const std::string &filename)
                 m_quads.push_back(new Quad(
                     all_vertices[quad_index[0]], all_vertices[quad_index[1]],
                     all_vertices[quad_index[2]], all_vertices[quad_index[3]]));
-
-/*(AbstractNode* tn = createNode(
-                    all_vertices[quad_index[0]], all_vertices[quad_index[1]],
-                    all_vertices[quad_index[2]], all_vertices[quad_index[3]],false,false);
-
-Vec3 pp(0,0,0);
-tn->pointInNode(pp);*/
-
             }
         }
     }
diff --git a/src/tracks/quad_graph.cpp b/src/tracks/quad_graph.cpp
index 00cdb3f72..e0467e570 100644
--- a/src/tracks/quad_graph.cpp
+++ b/src/tracks/quad_graph.cpp
@@ -223,6 +223,9 @@ void QuadGraph::load(const std::string &quad_file_name,
         if(xml_node->getName()=="node-list")
         {
             // Each quad is part of the graph exactly once now.
+            unsigned int to = 0;
+            xml_node->get("to-quad", &to);
+            assert(to + 1 == m_all_nodes.size());
             continue;
         }
         else if(xml_node->getName()=="edge-loop")