diff --git a/html/pages/device/graphs/network/wireless.inc.php b/html/pages/device/graphs/system/wireless.inc.php
similarity index 100%
rename from html/pages/device/graphs/network/wireless.inc.php
rename to html/pages/device/graphs/system/wireless.inc.php
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index 7c9c7ed22..314199503 100755
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -89,9 +89,9 @@
   while ($port = mysql_fetch_array($port_query)) {
     
     echo(" --> " . $port['ifDescr'] . " ");   
-    if($array[$device[device_id]][$port[ifIndex]] && $port['ignore'] == "0") { // Check to make sure Port data is cached.
+    if($array[$device['device_id']][$port['ifIndex']] && $port['ignore'] == "0") { // Check to make sure Port data is cached.
 
-      $this_port = &$array[$device[device_id]][$port[ifIndex]];
+      $this_port = &$array[$device['device_id']][$port['ifIndex']];
 
       $polled_period = $polled - $port['poll_time'];