diff --git a/setup/tools/clisetup/firstrun.func.php b/setup/tools/clisetup/firstrun.func.php
index 4ee5a321..5478219a 100644
--- a/setup/tools/clisetup/firstrun.func.php
+++ b/setup/tools/clisetup/firstrun.func.php
@@ -85,7 +85,7 @@ function firstrun()
         ['FileGen::generate', 'realms',                   null, null, null],
         ['FileGen::generate', 'statistics',               null, null, null],
         ['FileGen::generate', 'simpleImg',                null, null, null],
-        ['FileGen::generate', 'talents',                  null, null, null],
+        ['FileGen::generate', 'talentCalc',               null, null, null],
         ['FileGen::generate', 'pets',                     null, null, null],
         ['FileGen::generate', 'talentIcons',              null, null, null],
         ['FileGen::generate', 'glyphs',                   null, null, null],
diff --git a/setup/tools/sqlgen/spawns.func.php b/setup/tools/sqlgen/spawns.func.php
index 731fa200..db4df717 100644
--- a/setup/tools/sqlgen/spawns.func.php
+++ b/setup/tools/sqlgen/spawns.func.php
@@ -107,7 +107,7 @@ function spawns()                                           // and waypoints
                  ' - assembling waypoints from '.CLISetup::bold('waypoints')];
 
     $query[5] = ['SELECT c.guid, -w.id AS "npcOrPath", w.point, c.zoneId AS areaId, c.map, w.delay AS "wait", w.position_y AS `posX`, w.position_x AS `posY` ' .
-                 'FROM creature c JOIN creature_addon ca ON ca.guid = c.guid JOIN waypoint_data w ON w.id = ca.path_id',
+                 'FROM creature c JOIN creature_addon ca ON ca.guid = c.guid JOIN waypoint_data w ON w.id = ca.path_id WHERE ca.path_id <> 0',
                  ' - assembling waypoints from '.CLISetup::bold('waypoint_data')];
 
     $queryPost = 'SELECT dm.Id, wma.areaId, IFNULL(dm.floor, 0) AS floor, ' .