diff --git a/html/pages/devices.php b/html/pages/devices.php
index 1f157bd63..2f96eef5e 100644
--- a/html/pages/devices.php
+++ b/html/pages/devices.php
@@ -102,7 +102,6 @@ echo('<table cellpadding="7" cellspacing="0" class="devicetable" width="100%">
 $device_query = mysql_query($sql);
 while($device = mysql_fetch_array($device_query)) {
   if( devicepermitted($device['device_id']) ) {
-    #$device['uptime'] = @mysql_result(mysql_query("SELECT `attrib_value` FROM `devices_attribs` WHERE `device_id` = '" . $device['device_id'] ."' AND `attrib_type` = 'uptime'"), 0);
     include("includes/hostbox.inc");
   }
 }
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index b481e5af3..5ac932c93 100755
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -72,7 +72,7 @@
       $update .= ", `poll_period` = '".$polled_period."'";
 
       /// Copy ifHC[In|Out]Octets values to non-HC if they exist
-      if(is_numeric($this_port['ifHCInOctets']) && is_numeric($this_port['ifHCOutOctets'])) {
+      if($this_port['ifHCInOctets'] > 0 && is_numeric($this_port['ifHCInOctets']) && $this_port['ifHCOutOctets'] > 0 && is_numeric($this_port['ifHCOutOctets'])) {
         echo("HC ");
         $this_port['ifInOctets'] = $this_port['ifHCInOctets'];
 	$this_port['ifOutOctets'] = $this_port['ifHCOutOctets'];