diff --git a/includes/polling/os/allied.inc.php b/includes/polling/os/allied.inc.php
index b62b79a9e..6977f66a0 100644
--- a/includes/polling/os/allied.inc.php
+++ b/includes/polling/os/allied.inc.php
@@ -28,7 +28,7 @@ if (!$hardware && !$version && !$features)
 
 #Allied Telesyn AT-8948 version 2.7.4-02 22-Aug-2005
 
-list($a,$b,$c,$d,$e,$f) = explode(" ", $poll_device[sysDescr]);
+list($a,$b,$c,$d,$e,$f) = explode(" ", $poll_device['sysDescr']);
 
 if (!$hardware && !$version && !$features)
 {
diff --git a/includes/polling/os/aos.inc.php b/includes/polling/os/aos.inc.php
index 16ec03c10..e2da87a35 100755
--- a/includes/polling/os/aos.inc.php
+++ b/includes/polling/os/aos.inc.php
@@ -1,5 +1,5 @@
 <?php
 
-list(,$hardware,$version) = explode(' ',$poll_device[sysDescr]);
+list(,$hardware,$version) = explode(' ',$poll_device['sysDescr']);
 
 ?>
diff --git a/includes/polling/os/arista_eos.inc.php b/includes/polling/os/arista_eos.inc.php
index 26cefa536..82796aa34 100755
--- a/includes/polling/os/arista_eos.inc.php
+++ b/includes/polling/os/arista_eos.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-$version = preg_replace("/.+ version (.+) running on .+ (\S+)$/", "\\1||\\2", $poll_device[sysDescr]);
+$version = preg_replace("/.+ version (.+) running on .+ (\S+)$/", "\\1||\\2", $poll_device['sysDescr']);
 list($version,$hardware) = explode("||", $version);
 
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/arubaos.inc.php b/includes/polling/os/arubaos.inc.php
index 4617c32ea..692b560c4 100644
--- a/includes/polling/os/arubaos.inc.php
+++ b/includes/polling/os/arubaos.inc.php
@@ -2,6 +2,6 @@
 
 // ArubaOS (MODEL: Aruba3600), Version 6.1.2.2 (29541)
 $badchars = array("(", ")", ",");
-list(,,$hardware,,$version,) = str_replace($badchars, "", explode (" ", $poll_device[sysDescr]));
+list(,,$hardware,,$version,) = str_replace($badchars, "", explode (" ", $poll_device['sysDescr']));
 
 ?>
diff --git a/includes/polling/os/avocent.inc.php b/includes/polling/os/avocent.inc.php
index a2898ae65..23f480b30 100644
--- a/includes/polling/os/avocent.inc.php
+++ b/includes/polling/os/avocent.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if (strstr($poll_device[sysDescr], "AlterPath")) {
-  list($hardware, $version) = explode("-", trim(str_replace("version:", "", (str_replace("V_", "", $poll_device[sysDescr])))), 2);
+if (strstr($poll_device['sysDescr'], "AlterPath"))
+{
+  list($hardware, $version) = explode("-", trim(str_replace("version:", "", (str_replace("V_", "", $poll_device['sysDescr'])))), 2);
   $hardware = trim($hardware);
   $version  = trim($version);
   $features = trim(str_replace("#1", "", $version));
diff --git a/includes/polling/os/bnt.inc.php b/includes/polling/os/bnt.inc.php
index 29ed1798e..943cdf017 100644
--- a/includes/polling/os/bnt.inc.php
+++ b/includes/polling/os/bnt.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-preg_match('/Blade Network Technologies (.*)$/', $poll_device[sysDescr], $store);
+preg_match('/Blade Network Technologies (.*)$/', $poll_device['sysDescr'], $store);
 
 if (isset($store[1]))
 {
diff --git a/includes/polling/os/cat1900.inc.php b/includes/polling/os/cat1900.inc.php
index 9bcb4043d..e99686b06 100755
--- a/includes/polling/os/cat1900.inc.php
+++ b/includes/polling/os/cat1900.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-list(,$version) = explode(',',$poll_device[sysDescr],2);
+list(,$version) = explode(',',$poll_device['sysDescr'],2);
 $hardware = "1900";
 
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/catos.inc.php b/includes/polling/os/catos.inc.php
index ef190303b..c9f725918 100755
--- a/includes/polling/os/catos.inc.php
+++ b/includes/polling/os/catos.inc.php
@@ -15,10 +15,10 @@ if (!strstr($ciscomodel, " ") && strlen($ciscomodel) >= '3')
   $hardware = $ciscomodel;
 }
 
-$poll_device[sysDescr] = str_replace(", Inc.", "", $poll_device[sysDescr]); ## Make the two formats the same
-$poll_device[sysDescr] = str_replace("\n", " ", $poll_device[sysDescr]);
+$poll_device['sysDescr'] = str_replace(", Inc.", "", $poll_device['sysDescr']); ## Make the two formats the same
+$poll_device['sysDescr'] = str_replace("\n", " ", $poll_device['sysDescr']);
 
-list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $poll_device[sysDescr]);
+list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $poll_device['sysDescr']);
 list(,$features) = explode("-", $features);
 
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/dell-laser.inc.php b/includes/polling/os/dell-laser.inc.php
index cd1c7fafc..28aeaee43 100644
--- a/includes/polling/os/dell-laser.inc.php
+++ b/includes/polling/os/dell-laser.inc.php
@@ -13,7 +13,7 @@ foreach ($dellinfo as $dellinf)
 
 $hardware = $dell_laser['MDL'];
 
-list(,$version) = explode('Engine ',$poll_device[sysDescr]);
+list(,$version) = explode('Engine ',$poll_device['sysDescr']);
 
 $version = "Engine " . trim($version,')');
 
diff --git a/includes/polling/os/extremeware.inc.php b/includes/polling/os/extremeware.inc.php
index 830469483..00d92c2d5 100644
--- a/includes/polling/os/extremeware.inc.php
+++ b/includes/polling/os/extremeware.inc.php
@@ -9,10 +9,10 @@ echo("Doing Extreme: ");
 #Summit48(Yonetan) - Version 4.1.19 (Build 2) by Release_Master  Wed 08/09/2000  6:09p
 #Alpine3808 - Version 7.2.0 (Build 33) by Release_Master 07/09/04 14:05:12
 
-if (!strpos($poll_device[sysDescr], "XOS"))
+if (!strpos($poll_device['sysDescr'], "XOS"))
 {
   echo(" Extremeware \n");
-  list(, $datas) = explode(" - ", $poll_device[sysDescr]);
+  list(, $datas) = explode(" - ", $poll_device['sysDescr']);
   $datas = str_replace("(","", $datas);
   $datas = str_replace(")","", $datas);
   list($a,$b,$c,$d,$e,$f,$g,$h) = explode(" ", $datas);
@@ -28,7 +28,7 @@ else
   #ExtremeWare XOS version 11.5.2.10 v1152b10 by release-manager on Thu Oct 26 09:53:04 PDT 2006
 
   echo(" XOS \n");
-  list($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m) = explode(" ", str_replace("ExtremeWare XOS", "ExtremeXOS", $poll_device[sysDescr]));
+  list($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m) = explode(" ", str_replace("ExtremeWare XOS", "ExtremeXOS", $poll_device['sysDescr']));
   if ($b == "version")
   {
     $version = $c;
diff --git a/includes/polling/os/ies.inc.php b/includes/polling/os/ies.inc.php
index 2e696b601..f63a822bc 100644
--- a/includes/polling/os/ies.inc.php
+++ b/includes/polling/os/ies.inc.php
@@ -2,7 +2,7 @@
 
 $version = trim(snmp_get($device, "accessSwitchFWVersion.0", "-OQv", "ZYXEL-AS-MIB"),'"');
 
-preg_match("/IES-(\d)*/",$poll_device[sysDescr], $matches);
+preg_match("/IES-(\d)*/",$poll_device['sysDescr'], $matches);
 $hardware = $matches[0];
 
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/junos.inc.php b/includes/polling/os/junos.inc.php
index a323e5ee5..2b45de202 100644
--- a/includes/polling/os/junos.inc.php
+++ b/includes/polling/os/junos.inc.php
@@ -2,7 +2,7 @@
 
 $jun_ver = snmp_get($device, ".1.3.6.1.2.1.25.6.3.1.2.2", "-Oqv", "HOST-RESOURCES-MIB");
 
-if (strpos($poll_device[sysDescr], "olive"))
+if (strpos($poll_device['sysDescr'], "olive"))
 {
   $hardware = "Olive";
   $serial = "";
diff --git a/includes/polling/os/junose.inc.php b/includes/polling/os/junose.inc.php
index 87f82b595..196382c21 100644
--- a/includes/polling/os/junose.inc.php
+++ b/includes/polling/os/junose.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if (strpos($poll_device[sysDescr], "olive"))
+if (strpos($poll_device['sysDescr'], "olive"))
 {
   $hardware = "Olive";
   $serial = "";
diff --git a/includes/polling/os/panos.inc.php b/includes/polling/os/panos.inc.php
index 6c31b3b3c..33d119470 100644
--- a/includes/polling/os/panos.inc.php
+++ b/includes/polling/os/panos.inc.php
@@ -4,7 +4,7 @@ $hardware = trim(snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.2.1.0", "-OQv", "",
 $version = trim(snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.1.1.0", "-OQv", "", ""),'" ');
 $serial = trim(snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.1.3.0", "-OQv", "", ""),'" ');
 
-# list(,,,$hardware) = explode (" ", $poll_device[sysDescr]);
+# list(,,,$hardware) = explode (" ", $poll_device['sysDescr']);
 
 $sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/panos-sessions.rrd";
 $sessions = snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.3.3.0", "-Ovq");
diff --git a/includes/polling/os/powerconnect.inc.php b/includes/polling/os/powerconnect.inc.php
index cc2685151..4646e10bd 100644
--- a/includes/polling/os/powerconnect.inc.php
+++ b/includes/polling/os/powerconnect.inc.php
@@ -1,15 +1,12 @@
 <?php
 
-# FIXME snmp_get
-$snmp_cmd =  $config['snmpget'] . " -M ".$config['mibdir'] . " -m Dell-Vendor-MIB -O Qv -" . $device['snmpver'] . " -c " . $device['community'] . " " .
-                 $device['hostname'].":".$device['port'];
-$snmp_cmd .= " productIdentificationDisplayName.0 productIdentificationVersion.0 productIdentificationDescription.0";
-
-list($hardware, $version, $features) = explode("\n", shell_exec($snmp_cmd));
+$hardware = "Dell ".snmp_get($device, "productIdentificationDisplayName.0", "-Ovq", "Dell-Vendor-MIB");
+$version  = snmp_get($device, "productIdentificationVersion.0", "-Ovq", "Dell-Vendor-MIB");
+$features  = snmp_get($device, "productIdentificationDescription.0", "-Ovq", "Dell-Vendor-MIB");
 
 if (strstr($hardware,"No Such Object available"))
 {
-  $hardware = $poll_device[sysDescr];
+  $hardware = $poll_device['sysDescr'];
 }
 
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/procurve.inc.php b/includes/polling/os/procurve.inc.php
index 278d720a2..a3d7f461a 100755
--- a/includes/polling/os/procurve.inc.php
+++ b/includes/polling/os/procurve.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-list($hardware, $version, $features) = explode(",", str_replace(", ", ",", $poll_device[sysDescr]));
+list($hardware, $version, $features) = explode(",", str_replace(", ", ",", $poll_device['sysDescr']));
 list($features) = explode("(", $version);
 
 $fdb_rrd_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/fdb_count.rrd";
diff --git a/includes/polling/os/radlan.inc.php b/includes/polling/os/radlan.inc.php
index 1665951c3..50b618ecc 100644
--- a/includes/polling/os/radlan.inc.php
+++ b/includes/polling/os/radlan.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($poll_device[sysDescr] == "Neyland 24T")
+if ($poll_device['sysDescr'] == "Neyland 24T")
 {
   #$hardware = snmp_get($device, "productIdentificationVendor.0", "-Ovq", "Dell-Vendor-MIB");
   $hardware = "Dell ".snmp_get($device, "productIdentificationDisplayName.0", "-Ovq", "Dell-Vendor-MIB");
@@ -9,7 +9,7 @@ if ($poll_device[sysDescr] == "Neyland 24T")
 else
 {
   $version  = snmp_get($device, "rndBrgVersion.0", "-Ovq", "RADLAN-MIB");
-  $hardware = str_replace("ATI", "Allied Telesis", $poll_device[sysDescr]);
+  $hardware = str_replace("ATI", "Allied Telesis", $poll_device['sysDescr']);
 }
 $features = snmp_get($device, "rndBaseBootVersion.00", "-Ovq", "RADLAN-MIB");
 
diff --git a/includes/polling/os/screenos.inc.php b/includes/polling/os/screenos.inc.php
index 8fe860daf..9053a3478 100755
--- a/includes/polling/os/screenos.inc.php
+++ b/includes/polling/os/screenos.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-$version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "\\1||\\2||\\3||\\4", $poll_device[sysDescr]);
+$version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "\\1||\\2||\\3||\\4", $poll_device['sysDescr']);
 list($hardware,$version,$serial,$features) = explode("||", $version);
 
 $sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/screenos_sessions.rrd";
diff --git a/includes/polling/os/snom.inc.php b/includes/polling/os/snom.inc.php
index 23df6ebec..9e0ab3841 100755
--- a/includes/polling/os/snom.inc.php
+++ b/includes/polling/os/snom.inc.php
@@ -7,10 +7,10 @@ echo("Polling SNOM device...\n");
 ## FIXME - This needs a good cleanup...
 
 $cmd      = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.4";
-$poll_device[sysDescr] = `$cmd`;
-$poll_device[sysDescr] = str_replace("-", " ", $poll_device[sysDescr]);
-$poll_device[sysDescr] = str_replace("\"", "", $poll_device[sysDescr]);
-list($hardware, $features, $version) = explode(" ", $poll_device[sysDescr]);
+$poll_device['sysDescr'] = `$cmd`;
+$poll_device['sysDescr'] = str_replace("-", " ", $poll_device['sysDescr']);
+$poll_device['sysDescr'] = str_replace("\"", "", $poll_device['sysDescr']);
+list($hardware, $features, $version) = explode(" ", $poll_device['sysDescr']);
 
 // Get data for calls and network from SNOM specific SNMP OIDs.
 
diff --git a/includes/polling/os/speedtouch.inc.php b/includes/polling/os/speedtouch.inc.php
index d353ce94b..5a3550caf 100644
--- a/includes/polling/os/speedtouch.inc.php
+++ b/includes/polling/os/speedtouch.inc.php
@@ -2,7 +2,7 @@
 
 $serial = "";
 #list(,$hardware,) = explode(" ", $hardware);
-$hardware = $poll_device[sysDescr];
+$hardware = $poll_device['sysDescr'];
 
 $features = "";
 
diff --git a/includes/polling/os/symbol.inc.php b/includes/polling/os/symbol.inc.php
index b773b387b..fcfeaaac4 100644
--- a/includes/polling/os/symbol.inc.php
+++ b/includes/polling/os/symbol.inc.php
@@ -4,6 +4,6 @@ $fnSysVersion = snmp_get($device, ".1.3.6.1.4.1.388.11.2.2.1.3.2.0", "-Ovq");
 $serial       = trim(snmp_get($device, ".1.3.6.1.4.1.388.11.2.2.1.1.0", "-Ovq"),'"');
 $version      = trim(snmp_get($device, ".1.3.6.1.4.1.388.11.2.2.1.3.2.0", "-Ovq"),'"');
   //preg_match("/HW=(^\s]+)/",$sysDescr,$hardwarematches);
-  preg_match("/\s+[^\s]+/",$poll_device[sysDescr],$hardwarematches);
+  preg_match("/\s+[^\s]+/",$poll_device['sysDescr'],$hardwarematches);
 $hardware     = $hardwarematches[0];
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/tranzeo.inc.php b/includes/polling/os/tranzeo.inc.php
index 316fb0773..4d42475dc 100644
--- a/includes/polling/os/tranzeo.inc.php
+++ b/includes/polling/os/tranzeo.inc.php
@@ -7,7 +7,7 @@
 # Tranzeo TR6CPQ, OS 6.3.34(1019), FW TR6-2.0.12CPQ, 2.4GHz, 15dBi int. antenna
 # Tranzeo TR900Rt, OS 6.8.0(1024), FW TR900-3.3.3Rt, 900MHz, 17dBi ext. antenna
 
-list($hardware, $version, $features, $hardware_antenna) = explode(", ", $poll_device[sysDescr]);
+list($hardware, $version, $features, $hardware_antenna) = explode(", ", $poll_device['sysDescr']);
 
 list(,$version) = explode(" ", $version);
 list($version) = explode("(", $version);
diff --git a/includes/polling/os/unix.inc.php b/includes/polling/os/unix.inc.php
index ee24dba0e..a130401b9 100755
--- a/includes/polling/os/unix.inc.php
+++ b/includes/polling/os/unix.inc.php
@@ -2,15 +2,15 @@
 
 if ($device['os'] == "linux" || $device['os'] == "endian")
 {
-  list(,,$version) = explode (" ", $poll_device[sysDescr]);
-  if (strstr($poll_device[sysDescr], "386")|| strstr($poll_device[sysDescr], "486")||strstr($poll_device[sysDescr], "586")||strstr($poll_device[sysDescr], "686")) { $hardware = "Generic x86"; }
-  else if (strstr($poll_device[sysDescr], "x86_64")) { $hardware = "Generic x86 64-bit"; }
-  else if (strstr($poll_device[sysDescr], "sparc32")) { $hardware = "Generic SPARC 32-bit"; }
-  else if (strstr($poll_device[sysDescr], "sparc64")) { $hardware = "Generic SPARC 64-bit"; }
-  else if (strstr($poll_device[sysDescr], "armv5")) { $hardware = "Generic ARMv5"; }
-  else if (strstr($poll_device[sysDescr], "armv6")) { $hardware = "Generic ARMv6"; }
-  else if (strstr($poll_device[sysDescr], "armv7")) { $hardware = "Generic ARMv7"; }
-  else if (strstr($poll_device[sysDescr], "armv")) { $hardware = "Generic ARM"; }
+  list(,,$version) = explode (" ", $poll_device['sysDescr']);
+  if (strstr($poll_device['sysDescr'], "386")|| strstr($poll_device['sysDescr'], "486")||strstr($poll_device['sysDescr'], "586")||strstr($poll_device['sysDescr'], "686")) { $hardware = "Generic x86"; }
+  else if (strstr($poll_device['sysDescr'], "x86_64")) { $hardware = "Generic x86 64-bit"; }
+  else if (strstr($poll_device['sysDescr'], "sparc32")) { $hardware = "Generic SPARC 32-bit"; }
+  else if (strstr($poll_device['sysDescr'], "sparc64")) { $hardware = "Generic SPARC 64-bit"; }
+  else if (strstr($poll_device['sysDescr'], "armv5")) { $hardware = "Generic ARMv5"; }
+  else if (strstr($poll_device['sysDescr'], "armv6")) { $hardware = "Generic ARMv6"; }
+  else if (strstr($poll_device['sysDescr'], "armv7")) { $hardware = "Generic ARMv7"; }
+  else if (strstr($poll_device['sysDescr'], "armv")) { $hardware = "Generic ARM"; }
 
   # Distro "extend" support
   $features = snmp_get($device, ".1.3.6.1.4.1.2021.7890.1.3.1.1.6.100.105.115.116.114.111", "-Oqv", "UCD-SNMP-MIB");
@@ -30,33 +30,33 @@ if ($device['os'] == "linux" || $device['os'] == "endian")
 }
 elseif ($device['os'] == "freebsd")
 {
-  $poll_device[sysDescr] = str_replace(" 0 ", " ", $poll_device[sysDescr]);
-  list(,,$version) = explode (" ", $poll_device[sysDescr]);
-  if (strstr($poll_device[sysDescr], "i386")) { $hardware = "i386"; }
-  else if (strstr($poll_device[sysDescr], "amd64")) { $hardware = "amd64"; }
+  $poll_device['sysDescr'] = str_replace(" 0 ", " ", $poll_device['sysDescr']);
+  list(,,$version) = explode (" ", $poll_device['sysDescr']);
+  if (strstr($poll_device['sysDescr'], "i386")) { $hardware = "i386"; }
+  else if (strstr($poll_device['sysDescr'], "amd64")) { $hardware = "amd64"; }
   else { $hardware = "i386"; }
   $features = "GENERIC";
 }
 elseif ($device['os'] == "dragonfly")
 {
-  list(,,$version,,,$features,,$hardware) = explode (" ", $poll_device[sysDescr]);
+  list(,,$version,,,$features,,$hardware) = explode (" ", $poll_device['sysDescr']);
 }
 elseif ($device['os'] == "netbsd")
 {
-  list(,,$version,,,$features) = explode (" ", $poll_device[sysDescr]);
+  list(,,$version,,,$features) = explode (" ", $poll_device['sysDescr']);
   $features = str_replace("(", "", $features);
   $features = str_replace(")", "", $features);
-  list(,,$hardware) = explode ("$features", $poll_device[sysDescr]);
+  list(,,$hardware) = explode ("$features", $poll_device['sysDescr']);
 }
 elseif ($device['os'] == "openbsd" || $device['os'] == "solaris" || $device['os'] == "opensolaris")
 {
-  list(,,$version,$features,$hardware) = explode (" ", $poll_device[sysDescr]);
+  list(,,$version,$features,$hardware) = explode (" ", $poll_device['sysDescr']);
   $features = str_replace("(", "", $features);
   $features = str_replace(")", "", $features);
 }
 elseif ($device['os'] == "monowall" || $device['os'] == "Voswall")
 {
-  list(,,$version,$hardware,$freebsda, $freebsdb, $arch) = explode(" ", $poll_device[sysDescr]);
+  list(,,$version,$hardware,$freebsda, $freebsdb, $arch) = explode(" ", $poll_device['sysDescr']);
   $features = $freebsda . " " . $freebsdb;
   $hardware = "$hardware ($arch)";
   $hardware = str_replace("\"", "", $hardware);
diff --git a/includes/polling/os/vrp.inc.php b/includes/polling/os/vrp.inc.php
index d6ee7e36e..4d4a12cb0 100644
--- a/includes/polling/os/vrp.inc.php
+++ b/includes/polling/os/vrp.inc.php
@@ -2,7 +2,7 @@
 
 $hardware = trim(snmp_get($device, ".1.3.6.1.4.1.2011.2.33.20.1.1.1.3.0", "-OQv"),'"');
 
-preg_match("/Version .*\n/",$poll_device[sysDescr], $matches);
+preg_match("/Version .*\n/",$poll_device['sysDescr'], $matches);
 $version = trim(str_replace("Version ","",$matches[0]));
 
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/windows.inc.php b/includes/polling/os/windows.inc.php
index db6d81a55..a56a0325f 100755
--- a/includes/polling/os/windows.inc.php
+++ b/includes/polling/os/windows.inc.php
@@ -9,48 +9,48 @@
 #sysDescr.0 = STRING: Hardware: Intel64 Family 6 Model 23 Stepping 6 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)
 #sysDescr.0 = STRING: Hardware: AMD64 Family 16 Model 8 Stepping 0 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)
 
-if (strstr($poll_device[sysDescr], "x86"))     { $hardware = "Generic x86"; }
-if (strstr($poll_device[sysDescr], "ia64"))    { $hardware = "Intel Itanium IA64"; }
-if (strstr($poll_device[sysDescr], "EM64"))    { $hardware = "Intel x64"; }
-if (strstr($poll_device[sysDescr], "AMD64"))   { $hardware = "AMD x64"; }
-if (strstr($poll_device[sysDescr], "Intel64")) { $hardware = "Intel x64"; }
+if (strstr($poll_device['sysDescr'], "x86"))     { $hardware = "Generic x86"; }
+if (strstr($poll_device['sysDescr'], "ia64"))    { $hardware = "Intel Itanium IA64"; }
+if (strstr($poll_device['sysDescr'], "EM64"))    { $hardware = "Intel x64"; }
+if (strstr($poll_device['sysDescr'], "AMD64"))   { $hardware = "AMD x64"; }
+if (strstr($poll_device['sysDescr'], "Intel64")) { $hardware = "Intel x64"; }
 
 if($poll_device['sysObjectID'] == ".1.3.6.1.4.1.311.1.1.3.1.1") { ## Workstation
 
-  if (strstr($poll_device[sysDescr], "Build Number: 1057")) { $version = "NT 3.51 Workstation"; }
-  if (strstr($poll_device[sysDescr], "Build Number: 1381")) { $version = "NT 4.0 Workstation"; }
-  if (strstr($poll_device[sysDescr], "Build 2195"))         { $version = "2000 (NT 5.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 2600"))         { $version = "XP (NT 5.1)"; }
-  if (strstr($poll_device[sysDescr], "Build 3790"))         { $version = "XP x64 (NT 5.2)"; }
-  if (strstr($poll_device[sysDescr], "Build 6000"))         { $version = "Vista (NT 6.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 6001"))         { $version = "Vista SP1 (NT 6.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 6002"))         { $version = "Vista SP2 (NT 6.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 7600"))         { $version = "7 (NT 6.1)"; }
+  if (strstr($poll_device['sysDescr'], "Build Number: 1057")) { $version = "NT 3.51 Workstation"; }
+  if (strstr($poll_device['sysDescr'], "Build Number: 1381")) { $version = "NT 4.0 Workstation"; }
+  if (strstr($poll_device['sysDescr'], "Build 2195"))         { $version = "2000 (NT 5.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 2600"))         { $version = "XP (NT 5.1)"; }
+  if (strstr($poll_device['sysDescr'], "Build 3790"))         { $version = "XP x64 (NT 5.2)"; }
+  if (strstr($poll_device['sysDescr'], "Build 6000"))         { $version = "Vista (NT 6.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 6001"))         { $version = "Vista SP1 (NT 6.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 6002"))         { $version = "Vista SP2 (NT 6.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 7600"))         { $version = "7 (NT 6.1)"; }
 
 } elseif ($poll_device['sysObjectID'] == ".1.3.6.1.4.1.311.1.1.3.1.2") { ## Server
 
-  if (strstr($poll_device[sysDescr], "Build Number: 1057")) { $version = "NT Server 3.51"; }
-  if (strstr($poll_device[sysDescr], "Build Number: 1381")) { $version = "NT Server 4.0"; }
-  if (strstr($poll_device[sysDescr], "Build 2195"))         { $version = "2000 Server (NT 5.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 3790"))         { $version = "Server 2003 (NT 5.2)"; }
-  if (strstr($poll_device[sysDescr], "Build 6001"))         { $version = "Server 2008 (NT 6.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 6002"))         { $version = "Server 2008 SP2 (NT 6.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 7600"))         { $version = "Server 2008 R2(NT 6.1)"; }
+  if (strstr($poll_device['sysDescr'], "Build Number: 1057")) { $version = "NT Server 3.51"; }
+  if (strstr($poll_device['sysDescr'], "Build Number: 1381")) { $version = "NT Server 4.0"; }
+  if (strstr($poll_device['sysDescr'], "Build 2195"))         { $version = "2000 Server (NT 5.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 3790"))         { $version = "Server 2003 (NT 5.2)"; }
+  if (strstr($poll_device['sysDescr'], "Build 6001"))         { $version = "Server 2008 (NT 6.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 6002"))         { $version = "Server 2008 SP2 (NT 6.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 7600"))         { $version = "Server 2008 R2(NT 6.1)"; }
 
 } elseif ($poll_device['sysObjectID'] == ".1.3.6.1.4.1.311.1.1.3.1.3") { ## Datacentre Server
 
-  if (strstr($poll_device[sysDescr], "Build Number: 1057")) { $version = "NT Datacenter 3.51"; }
-  if (strstr($poll_device[sysDescr], "Build Number: 1381")) { $version = "NT Datacenter 4.0"; }
-  if (strstr($poll_device[sysDescr], "Build 2195"))         { $version = "2000 Datacenter Server (NT 5.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 3790"))         { $version = "Server 2003 Datacenter (NT 5.2)"; }
-  if (strstr($poll_device[sysDescr], "Build 6001"))         { $version = "Server 2008 Datacenter (NT 6.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 6002"))         { $version = "Server 2008 Datacenter SP2 (NT 6.0)"; }
-  if (strstr($poll_device[sysDescr], "Build 7600"))         { $version = "Server 2008 Datacenter R2 (NT 6.1)"; }
+  if (strstr($poll_device['sysDescr'], "Build Number: 1057")) { $version = "NT Datacenter 3.51"; }
+  if (strstr($poll_device['sysDescr'], "Build Number: 1381")) { $version = "NT Datacenter 4.0"; }
+  if (strstr($poll_device['sysDescr'], "Build 2195"))         { $version = "2000 Datacenter Server (NT 5.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 3790"))         { $version = "Server 2003 Datacenter (NT 5.2)"; }
+  if (strstr($poll_device['sysDescr'], "Build 6001"))         { $version = "Server 2008 Datacenter (NT 6.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 6002"))         { $version = "Server 2008 Datacenter SP2 (NT 6.0)"; }
+  if (strstr($poll_device['sysDescr'], "Build 7600"))         { $version = "Server 2008 Datacenter R2 (NT 6.1)"; }
 
 }
 
-if (strstr($poll_device[sysDescr], "Uniprocessor"))   { $features = "Uniprocessor"; }
-if (strstr($poll_device[sysDescr], "Multiprocessor")) { $features = "Multiprocessor"; }
+if (strstr($poll_device['sysDescr'], "Uniprocessor"))   { $features = "Uniprocessor"; }
+if (strstr($poll_device['sysDescr'], "Multiprocessor")) { $features = "Multiprocessor"; }
 
 ### Detect processor type? : I.E.  x86 Family 15 Model 2 Stepping 7
 
diff --git a/includes/polling/os/zywall.inc.php b/includes/polling/os/zywall.inc.php
index 2022c2621..91156e604 100644
--- a/includes/polling/os/zywall.inc.php
+++ b/includes/polling/os/zywall.inc.php
@@ -1,5 +1,5 @@
 <?php
 
-$hardware = $poll_device[sysDescr];
+$hardware = $poll_device['sysDescr'];
 
 ?>
\ No newline at end of file
diff --git a/includes/polling/os/zyxelnwa.inc.php b/includes/polling/os/zyxelnwa.inc.php
index 2022c2621..91156e604 100644
--- a/includes/polling/os/zyxelnwa.inc.php
+++ b/includes/polling/os/zyxelnwa.inc.php
@@ -1,5 +1,5 @@
 <?php
 
-$hardware = $poll_device[sysDescr];
+$hardware = $poll_device['sysDescr'];
 
 ?>
\ No newline at end of file