diff --git a/html/map.php b/html/map.php
index 9425de019c..68b2ad0c6a 100755
--- a/html/map.php
+++ b/html/map.php
@@ -15,8 +15,6 @@ include("includes/authenticate.inc.php");
               eval("\$config['" . $confitem . "'] = \$confval;");
           }
       }
-  } else {
-#      echo "Please check config.php.default and adjust your settings to reflect the new Multi-Tenancy configuration.";
   }
 
 
diff --git a/includes/discovery/processors-ironware.inc.php b/includes/discovery/processors-ironware.inc.php
index dd09278efd..979a007535 100755
--- a/includes/discovery/processors-ironware.inc.php
+++ b/includes/discovery/processors-ironware.inc.php
@@ -38,7 +38,7 @@
       }
     }
   } 
-  ## End Cisco Processors
+  ## End Ironware Processors
 
   unset ($processors_array);
 
diff --git a/includes/discovery/q-bridge-mib.inc.php b/includes/discovery/q-bridge-mib.inc.php
index a74903a017..0a6f563ad3 100644
--- a/includes/discovery/q-bridge-mib.inc.php
+++ b/includes/discovery/q-bridge-mib.inc.php
@@ -17,12 +17,12 @@
 
     foreach(explode("\n", $vlans) as $vlan_oid) {
 
-      list($oid,$vlan) = split(' ',$vlan_oid);
+      list($oid,$vlan_index) = split(' ',$vlan_oid);
       $oid_ex = explode('.',$oid);
-      $oid = $oid_ex[count($oid_ex)-1];
+      $vlan = $oid_ex[count($oid_ex)-1];
 
       $vlan_descr_cmd  = $config['snmpget'] . " -M " . $config['mibdir'] . " -m Q-BRIDGE-MIB -O nvq -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " "; 
-      $vlan_descr_cmd .= "dot1qVlanStaticName.$oid|grep -v \"No Such Instance currently exists at this OID\"";
+      $vlan_descr_cmd .= "dot1qVlanStaticName.$vlan|grep -v \"No Such Instance currently exists at this OID\"";
       $vlan_descr = shell_exec($vlan_descr_cmd);
 
       $vlan_descr = trim(str_replace("\"", "", $vlan_descr));