diff --git a/html/includes/hostbox.inc.php b/html/includes/hostbox.inc.php
index 2d90c1002..3dd8726c2 100644
--- a/html/includes/hostbox.inc.php
+++ b/html/includes/hostbox.inc.php
@@ -6,7 +6,7 @@ if ($device['status'] == '0')
 {
   $class = "list-device-down"; 
 } else { 
-  $class = "list-device"; unset ($tr); 
+  $class = "list-device";
 }
 if ($device['ignore'] == '1') 
 {
@@ -43,12 +43,9 @@ if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.
 echo('<br />');
 if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
 echo ('</td>');
-
 echo('    <td>' . $device['hardware'] . '<br />' . $device['features'] . '</td>');
-
 echo('    <td>' . $device['os_text'] . '<br />' . $device['version'] . '</td>');
-
-echo('    <td>' . formatUptime($device['uptime']) . ' <br />');
+echo('    <td>' . formatUptime($device['uptime'], 'short') . ' <br />');
 
 if (get_dev_attrib($device,'override_sysLocation_bool')) {  $device['location'] = get_dev_attrib($device,'override_sysLocation_string'); }
 echo('    ' . truncate($device['location'],32, '') . '</td>');
diff --git a/poller.php b/poller.php
index c3e79191f..12a117581 100755
--- a/poller.php
+++ b/poller.php
@@ -79,7 +79,7 @@ if (isset($options['d']))
 
 echo("Starting polling run:\n\n");
 $polled_devices = 0;
-$device_query = mysql_query("SELECT `device_id` FROM `devices` WHERE `ignore` = 0 AND `disabled` = 0 $where  ORDER BY `device_id` ASC");
+$device_query = mysql_query("SELECT `device_id` FROM `devices` WHERE `disabled` = 0 $where  ORDER BY `device_id` ASC");
 
 while ($device = mysql_fetch_assoc($device_query))
 {