diff --git a/module/build/model.php b/module/build/model.php
index 0f98597790..7a137cfe63 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -568,25 +568,25 @@ class buildModel extends model
      * Bugs and stories associated with child builds.
      *
      * @param  int    $buildID
-     * @param  string    $childBuilds
+     * @param  string $childBuildIDList
      * @access public
      * @return void
      */
-    public function linkChildBuilds($buildID, $childBuilds)
+    public function linkChildBuilds($buildID, $childBuildIDList)
     {
-        $build     = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
-        $buildList = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->in($childBuilds)->fetchAll();
+        $build       = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
+        $childBuilds = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->in($childBuildIDList)->fetchAll();
 
-        foreach($buildList as $buildInfo)
+        foreach($childBuilds as $childBuild)
         {
-            if($buildInfo->bugs)    $build->bugs    .= ",{$buildInfo->bugs}";
-            if($buildInfo->stories) $build->stories .= ",{$buildInfo->stories}";
+            if($childBuild->bugs)    $build->bugs    .= ",{$childBuild->bugs}";
+            if($childBuild->stories) $build->stories .= ",{$childBuild->stories}";
         }
 
         $build->bugs    = explode(',', $build->bugs);
-        $build->bugs    = join(',', array_filter($build->bugs));
+        $build->bugs    = join(',', array_unique(array_filter($build->bugs)));
         $build->stories = explode(',', $build->stories);
-        $build->stories = join(',', array_filter($build->stories));
+        $build->stories = join(',', array_unique(array_filter($build->stories)));
 
         $this->dao->update(TABLE_BUILD)->data($build)->where('id')->eq($buildID)->exec();
     }
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 2654ddf619..09d5aca48b 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -248,7 +248,7 @@
         <?php if(!empty($product) and $canBatchEdit):?>
         <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
         <?php
-        $summary = empty($productLines) ? sprintf($lang->product->pageSummary, count($productStats)) : sprintf($lang->product->lineSummary, count($lineNames), count($productStats));
+        $summary = (empty($productLines) or $this->config->systemMode == 'light') ? sprintf($lang->product->pageSummary, count($productStats)) : sprintf($lang->product->lineSummary, count($lineNames), count($productStats));
         echo "<div id='productsCount' class='statistic'>$summary</div>";
         ?>
         <div class="table-actions btn-toolbar">