diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 0c2c9bd63..5eb161cf5 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -84,6 +84,8 @@ SET(zone_sources
 	npc_ai.cpp
 	object.cpp
 	oriented_bounding_box.cpp
+	pathfinder_nav_mesh.cpp
+	pathfinder_waypoint.cpp
 	pathing.cpp
 	perl_client.cpp
 	perl_doors.cpp
@@ -197,6 +199,9 @@ SET(zone_headers
 	npc_ai.h
 	object.h
 	oriented_bounding_box.h
+	pathfinder_interface.h
+	pathfinder_nav_mesh.h
+	pathfinder_waypoint.h
 	pathing.h
 	perlpacket.h
 	petitions.h
diff --git a/zone/command.cpp b/zone/command.cpp
index cbcdf6bb3..9463e2484 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -2317,13 +2317,13 @@ void command_race(Client *c, const Seperator *sep)
 	Mob *t=c->CastToMob();
 
 	// Need to figure out max race for LoY/LDoN: going with upper bound of 500 now for testing
-	if (sep->IsNumber(1) && atoi(sep->arg[1]) >= 0 && atoi(sep->arg[1]) <= 724) {
+	if (sep->IsNumber(1) && atoi(sep->arg[1]) >= 0 && atoi(sep->arg[1]) <= 2259) {
 		if ((c->GetTarget()) && c->Admin() >= commandRaceOthers)
 			t=c->GetTarget();
 		t->SendIllusionPacket(atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: #race [0-724] (0 for back to normal)");
+		c->Message(0, "Usage: #race [0-2259] (0 for back to normal)");
 }
 
 void command_gender(Client *c, const Seperator *sep)
diff --git a/zone/pathing.cpp b/zone/pathing.cpp
index 25d996eac..35e3edcb3 100644
--- a/zone/pathing.cpp
+++ b/zone/pathing.cpp
@@ -549,18 +549,11 @@ void PathManager::SpawnPathNodes()
 		auto npc_type = new NPCType;
 		memset(npc_type, 0, sizeof(NPCType));
 
-		if(PathNodes[i].id < 10)
-			sprintf(npc_type->name, "%s", DigitToWord(PathNodes[i].id));
-		else if(PathNodes[i].id < 100)
-			sprintf(npc_type->name, "%s_%s", DigitToWord(PathNodes[i].id/10), DigitToWord(PathNodes[i].id % 10));
-		else
-			sprintf(npc_type->name, "%s_%s_%s", DigitToWord(PathNodes[i].id/100), DigitToWord((PathNodes[i].id % 100)/10),
-				DigitToWord(((PathNodes[i].id % 100) %10)));
-
-		sprintf(npc_type->lastname, "%i", PathNodes[i].id);
+		auto c = PathNodes[i].id / 1000u;
+		sprintf(npc_type->name, "Node%u", c);
 		npc_type->cur_hp = 4000000;
 		npc_type->max_hp = 4000000;
-		npc_type->race = 151;
+		npc_type->race = 2254;
 		npc_type->gender = 2;
 		npc_type->class_ = 9;
 		npc_type->deity= 1;