diff --git a/html/map.php b/html/map.php
index d0227ff5f..2076b0020 100755
--- a/html/map.php
+++ b/html/map.php
@@ -41,7 +41,7 @@ if (preg_match("/^[a-z]*$/", $_GET['format']))
           $dst_if = $link['dst_if'];
 
           $i = 0; $done = 0;
-          while ($i < count($linkdone)) 
+          while (isset($linkdone) && $i < count($linkdone))
           {
             $thislink = "$dst_if $src_if";
             if ($linkdone[$i] == $thislink) { $done = 1; }
diff --git a/includes/discovery/cdp-lldp.inc.php b/includes/discovery/cdp-lldp.inc.php
index 2ebc5e5df..dd681721d 100755
--- a/includes/discovery/cdp-lldp.inc.php
+++ b/includes/discovery/cdp-lldp.inc.php
@@ -32,7 +32,7 @@ unset($lldp_array);
 $lldp_array = snmpwalk_cache_threepart_oid("lldpRemoteSystemsData", $device, array(), "LLDP-MIB");
 $lldp_array = $lldp_array[$device['device_id']];
 if($lldp_array) {
-  unset($lldp_links);
+  $lldp_links = "";
   foreach( array_keys($lldp_array) as $key) { 
     $lldp_if_array = $lldp_array[$key]; 
     foreach( array_keys($lldp_if_array) as $entry_key) {
@@ -109,12 +109,12 @@ $query = mysql_query($sql);
 while ($test_link = mysql_fetch_array($query)) {
   unset($exists);
   $i = 0;
-  while ($i < count($link_exists) && !$exists) {
+  while ($i < count($link_exists) && !isset($exists)) {
     $this_link = $test_link['src_if'] . ",". $test_link['dst_if'];
     if ($link_exists[$i] == $this_link) { $exists = 1; }
     $i++;
   }
-  if(!$exists) {
+  if(!isset($exists)) {
     echo("-");
     mysql_query("DELETE FROM `links` WHERE `src_if` = '".$test_link['src_if']."' AND `dst_if` = '".$test_link['dst_if']."'");
     if($debug) { echo($link_exists[$i] . " REMOVED \n"); }
diff --git a/includes/discovery/hr-device.inc.php b/includes/discovery/hr-device.inc.php
index 9da7c3470..3dd9a4c3a 100755
--- a/includes/discovery/hr-device.inc.php
+++ b/includes/discovery/hr-device.inc.php
@@ -4,7 +4,7 @@ echo("hrDevice : ");
 
 $hrDevice_oids = array('hrDeviceIndex','hrDeviceType','hrDeviceDescr','hrDeviceStatus','hrDeviceErrors','hrProcessorLoad');
 
-foreach ($hrDevice_oids as $oid) { $hrDevice_array = snmp_cache_oid($oid, $device, $hrDevice_array, "HOST-RESOURCES-MIB:HOST-RESOURCES-TYPES"); }
+foreach ($hrDevice_oids as $oid) { $hrDevice_array = snmp_cache_oid($oid, $device, array(), "HOST-RESOURCES-MIB:HOST-RESOURCES-TYPES"); }
 
 foreach($hrDevice_array[$device['device_id']] as $hrDevice) {
   if(is_array($hrDevice)) {
diff --git a/includes/discovery/q-bridge-mib.php b/includes/discovery/q-bridge-mib.php
index bc66b35f7..7562c1791 100644
--- a/includes/discovery/q-bridge-mib.php
+++ b/includes/discovery/q-bridge-mib.php
@@ -39,7 +39,7 @@
 
     }
 
-    $device_vlans = mysql_query("SELECT * FROM `vlans` WHERE `device_id` = '" . $device['device_id'] . "' AND `vlan_domain` = '" . $vtp_domain . "'");
+    $device_vlans = mysql_query("SELECT * FROM `vlans` WHERE `device_id` = '" . $device['device_id'] . "'");
     while($dev_vlan = mysql_fetch_array($device_vlans)) {
       unset($vlan_exists);
       foreach($this_vlans as $test_vlan) {