diff --git a/includes/types/item.class.php b/includes/types/item.class.php
index 1c6d3c22..e15559d3 100644
--- a/includes/types/item.class.php
+++ b/includes/types/item.class.php
@@ -711,7 +711,13 @@ class ItemList extends BaseType
         // Sockets w/ Gems
         if (!empty($enhance['g']))
         {
-            $gems = DB::Aowow()->select('SELECT i.id AS ARRAY_KEY, i.iconString, ae.*, i.gemColorMask AS colorMask FROM ?_items i JOIN ?_itemenchantment ae ON ae.id = i.gemEnchantmentId WHERE i.id IN (?a)', $enhance['g']);
+            $gems = DB::Aowow()->select('
+                SELECT it.id AS ARRAY_KEY, ic.iconString, ae.*, it.gemColorMask AS colorMask
+                FROM   ?_items it
+                JOIN   ?_itemenchantment ae ON ae.id = it.gemEnchantmentId
+                JOIN   ?_icons ic ON ic.id = -it.displayId
+                WHERE  it.id IN (?a)',
+                $enhance['g']);
             foreach ($enhance['g'] as $k => $v)
                 if ($v && !in_array($v, array_keys($gems))) // 0 is valid
                     unset($enhance['g'][$k]);
diff --git a/pages/object.php b/pages/object.php
index 3b73f000..0a1f324d 100644
--- a/pages/object.php
+++ b/pages/object.php
@@ -489,7 +489,7 @@ class ObjectPage extends GenericPage
     public function notFound()
     {
         if ($this->mode != CACHE_TYPE_TOOLTIP)
-            return parent::notFound(Lang::game('gameObject'), Lang:gameObject('notFound'));
+            return parent::notFound(Lang::game('gameObject'), Lang::gameObject('notFound'));
 
         header('Content-type: application/x-javascript; charset=utf-8');
         echo $this->generateTooltip(true);
diff --git a/setup/tools/sqlgen/item_stats.func.php b/setup/tools/sqlgen/item_stats.func.php
index 72160672..268d3c02 100644
--- a/setup/tools/sqlgen/item_stats.func.php
+++ b/setup/tools/sqlgen/item_stats.func.php
@@ -99,7 +99,7 @@ class ItemStatSetup extends ItemList
                     if ($item > 0)                          // apply socketBonus
                         $this->json[$item]['socketbonusstat'] = $stats;
                     else /* if ($item < 0) */               // apply gemEnchantment
-                        Util::arraySumByKey($this->json[-$item][$mod], $stats);
+                        Util::arraySumByKey($this->json[-$item], $stats);
                 }
             }
         }
diff --git a/setup/tools/sqlgen/taxi.func.php b/setup/tools/sqlgen/taxi.func.php
index 0ae0a125..8a256794 100644
--- a/setup/tools/sqlgen/taxi.func.php
+++ b/setup/tools/sqlgen/taxi.func.php
@@ -120,7 +120,7 @@ function taxi()                                             // path & nodes
                 continue;
 
             $dist = pow($c['posX'] - $n['origPosX'], 2) + pow($c['posY'] - $n['origPosY'], 2);
-            if ($dist  > 1000)
+            if ($dist > 1000)
                 continue;
 
             if (!isset($n['dist']) || $n['dist'] < $dist)