diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php
index 0153f9d8b..6586726fb 100755
--- a/includes/polling/bgp-peers.inc.php
+++ b/includes/polling/bgp-peers.inc.php
@@ -4,6 +4,8 @@
 
 echo("Polling BGP peers\n");
 
+global $debug;
+
 if (!$config['enable_bgp'])
 {
   echo("BGP Support Disabled\n");
@@ -48,7 +50,9 @@ else
       }
 
       ## FIXME - move to function (and clean up, wtf?)
-      $peer_cmd  = $config['snmpget'] . " -M ".$config['mibdir'] . "/junos -m BGP4-V2-MIB-JUNIPER -OUvq -" . $device['snmpver'] . " -c" . $device['community'] . " " . $device['hostname'].":".$device['port'];
+      $peer_cmd  = $config['snmpget'] . " -M ".$config['mibdir'] . "/junos -m BGP4-V2-MIB-JUNIPER -OUvq -" . $device['snmpver'] . " -c" . $device['community'];
+      $peer_cmd .= ' -M"' . $config['install_dir'] . '/mibs/junos"';
+      $peer_cmd .= " " . $device['hostname'].":".$device['port'];
       $peer_cmd .= " jnxBgpM2PeerState.0.ipv6." . $junos_v6[$peer_ip];
       $peer_cmd .= " jnxBgpM2PeerStatus.0.ipv6." . $junos_v6[$peer_ip]; # Should be jnxBgpM2CfgPeerAdminStatus but doesn't seem to be implemented?
       $peer_cmd .= " jnxBgpM2PeerInUpdates.0.ipv6." . $junos_v6[$peer_ip];
@@ -58,7 +62,7 @@ else
       $peer_cmd .= " jnxBgpM2PeerFsmEstablishedTime.0.ipv6." . $junos_v6[$peer_ip];
       $peer_cmd .= " jnxBgpM2PeerInUpdatesElapsedTime.0.ipv6." . $junos_v6[$peer_ip];
       $peer_cmd .= " jnxBgpM2PeerLocalAddr.0.ipv6." . $junos_v6[$peer_ip];
-      $peer_cmd .= ' -M"' . $config['install_dir'] . '/mibs/junos"|grep -v "No Such Instance"';
+      $peer_cmd .= '|grep -v "No Such Instance"';
       if ($debug) echo("\n$peer_cmd\n");
       $peer_data = trim(`$peer_cmd`);
       list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime, $bgpLocalAddr) = explode("\n", $peer_data);
diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index 76df18d1b..dd4697c8a 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -256,7 +256,7 @@ function snmpwalk_cache_cip($device, $oid, $array, $mib = 0)
 
   $cmd = $snmpcommand . " -O snQ -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   if ($mib) { $cmd .= " -m $mib"; }
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
   if (isset($retries)) { $cmd .= " -r " . $retries; }
 
@@ -321,7 +321,7 @@ function snmp_cache_ifIndex($device)
   }
 
   $cmd = $snmpcommand . " -O Qs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   $cmd .= " -m IF-MIB ifIndex";
 
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
@@ -463,7 +463,7 @@ function snmpwalk_cache_twopart_oid($device, $oid, $array, $mib = 0)
     $snmpcommand = $config['snmpbulkwalk'];
   }
   $cmd = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   if ($mib) { $cmd .= " -m $mib"; }
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
   if (isset($retries)) { $cmd .= " -r " . $retries; }
@@ -520,7 +520,7 @@ function snmpwalk_cache_threepart_oid($device, $oid, $array, $mib = 0)
   }
 
   $cmd = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   if ($mib) { $cmd .= " -m $mib"; }
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
   if (isset($retries)) { $cmd .= " -r " . $retries; }
@@ -578,7 +578,7 @@ function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0)
 
   $cmd = $snmpcommand . " -O QUs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   if ($mib) { $cmd .= " -m $mib"; }
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
   if (isset($retries)) { $cmd .= " -r " . $retries; }
   $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
@@ -638,7 +638,7 @@ function snmp_cache_port_oids($oids, $port, $device, $array, $mib=0)
   $cmd = $config['snmpget'] . " -O vq -" . $device['snmpver'] . " -c " . $device['community'] . " ";
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
   if (isset($retries)) { $cmd .= " -r " . $retries; }
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   if ($mib) { $cmd .= " -m $mib"; }
   $cmd .= " -t " . $timeout . " -r " . $retries;
   $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$string;
@@ -682,7 +682,7 @@ function snmp_cache_portIfIndex($device, $array)
   }
 
   $cmd = $config['snmpwalk'] . " -CI -m CISCO-STACK-MIB -O q -" . $device['snmpver'] . " -c " . $device['community'] . " ";
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
   if (isset($retries)) { $cmd .= " -r " . $retries; }
   $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portIfIndex";
@@ -726,7 +726,7 @@ function snmp_cache_portName($device, $array)
   }
 
   $cmd = $config['snmpwalk'] . " -CI -m CISCO-STACK-MIB -O Qs -" . $device['snmpver'] . " -c " . $device['community'] . " ";
-  $cmd .= " -M ".$config['install_dir']."/mibs/";
+  $cmd .= " -M ".$config['install_dir']."/mibs";
   if (isset($timeout)) { $cmd .= " -t " . $timeout; }
   if (isset($retries)) { $cmd .= " -r " . $retries; }
   $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portName";
diff --git a/includes/static-config.php b/includes/static-config.php
index 5d4982aca..fe937da28 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -1105,7 +1105,7 @@ if (isset($config['cdp_autocreate']))
 
 if (!isset($config['mibdir']))
 {
-  $config['mibdir'] =  $config['install_dir']."/mibs/";
+  $config['mibdir'] =  $config['install_dir']."/mibs";
 }
 $config['mib_dir'] = $config['mibdir'];