diff --git a/setup/tools/clisetup/firstrun.func.php b/setup/tools/clisetup/firstrun.func.php
index ef305873..c58f612b 100644
--- a/setup/tools/clisetup/firstrun.func.php
+++ b/setup/tools/clisetup/firstrun.func.php
@@ -28,7 +28,6 @@ function firstrun()
         ['dbconfig',          null,                      'testDB',    'Please enter your database credentials.', 'could not establish connection to:'],
         ['siteconfig',        null,                      'testSelf',  'SITE_HOST and STATIC_HOST '.CLI::bold('must').' be set. Also enable FORCE_SSL if needed. You may also want to change other variables such as NAME, NAME_SHORT or LOCALES.', 'could not access:'],
         // sql- and build- stuff here
-        ['SqlGen::generate',  'achievementcategory',      null, null, null],
         ['SqlGen::generate',  'achievementcriteria',      null, null, null],
         ['SqlGen::generate',  'glyphproperties',          null, null, null],
         ['SqlGen::generate',  'itemenchantment',          null, null, null],
diff --git a/setup/tools/sqlgen/areatrigger.func.php b/setup/tools/sqlgen/areatrigger.func.php
index d62c2ec0..407f5c84 100644
--- a/setup/tools/sqlgen/areatrigger.func.php
+++ b/setup/tools/sqlgen/areatrigger.func.php
@@ -12,7 +12,7 @@ SqlGen::register(new class extends SetupScript
     protected $command = 'areatrigger';
 
     protected $tblDependancyTC = ['areatrigger_involvedrelation', 'areatrigger_scripts', 'areatrigger_tavern', 'areatrigger_teleport', 'quest_template', 'quest_template_addon'];
-    protected $dbcSourceFiles  = ['areatrigger'];
+    protected $dbcSourceFiles  = ['areatrigger', 'worldmaparea', 'dungeonmap'];
 
     public function generate(array $ids = []) : bool
     {