diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index 330535e18b..4e4ca34fa6 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -60,7 +60,7 @@
           <?php if($hasCustomSeverity):?>
           <span class='<?php echo 'label-severity-custom';?>' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity);?></span>
           <?php else:?>
-          <span class='label-severity' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'><?php echo $bug->severity;?></span>
+          <span class='label-severity' title='<?php echo zget($lang->bug->severityList, $bug->severity);?>' data-severity='<?php echo $bug->severity;?>'></span>
           <?php endif;?>
         </td>
         <td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 98920fe710..6a0c258806 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -427,6 +427,7 @@ class upgradeModel extends model
                     {
                         $fields = array();
                         $table  = $out[1][0];
+                        $table = str_replace('zt_', $this->config->db->prefix, $out[1][0]);
                         try
                         {
                             $tableExists = true;