diff --git a/discovery.php b/discovery.php
index 25019bc1b..ac86b23e6 100755
--- a/discovery.php
+++ b/discovery.php
@@ -160,6 +160,7 @@ function discover_device($device, $options)
 {
 
   global $config;
+  global $device;
   global $valid; $valid = array(); ## Reset $valid array
 
   $attribs = get_dev_attribs($device['device_id']);
@@ -181,10 +182,7 @@ function discover_device($device, $options)
 
   echo("\n");
 
-  #include("includes/discovery/os.inc.php");
-
   ### If we've specified a module, use that, else walk the modules array
-
   if ($options['m'])
   {
     if (is_file("includes/discovery/".$options['m'].".inc.php"))
diff --git a/poller.php b/poller.php
index 877cbecd0..c0e6f54b4 100755
--- a/poller.php
+++ b/poller.php
@@ -107,6 +107,7 @@ while ($device = mysql_fetch_assoc($device_query))
 function poll_device($device, $options) {
 
   global $config;
+  global $device;
 
   $attribs = get_dev_attribs($device['device_id']);