diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php
index 676177c2cc..8ab7be2631 100644
--- a/html/includes/print-vlan.inc.php
+++ b/html/includes/print-vlan.inc.php
@@ -27,7 +27,7 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?
}
else
{
- echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label']));
+ echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label'])));
$vlan['port_sep'] = ", ";
}
}
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index ee94053cf9..4bec9bc8c3 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -239,6 +239,7 @@ $config['device_traffic_iftype'][] = '/virtual/';
$config['device_traffic_iftype'][] = '/mpls/';
$config['device_traffic_iftype'][] = '/ieee8023adLag/';
$config['device_traffic_iftype'][] = '/l2vlan/';
+$config['device_traffic_iftype'][] = '/ppp/';
$config['device_traffic_descr'][] = '/loopback/';
$config['device_traffic_descr'][] = '/vlan/';
@@ -384,6 +385,7 @@ $config['discovery_modules']['cisco-vlans'] = 1;
$config['discovery_modules']['cisco-mac-accounting'] = 1;
$config['discovery_modules']['cisco-pw'] = 1;
$config['discovery_modules']['cisco-vrf'] = 1;
+$config['discovery_modules']['cisco-cef'] = 1;
$config['discovery_modules']['vmware-vminfo'] = 1;
$config['discovery_modules']['libvirt-vminfo'] = 1;
$config['discovery_modules']['toner'] = 1;
diff --git a/includes/discovery/cisco-cef.inc.php b/includes/discovery/cisco-cef.inc.php
index 1a3c7fd00d..f029c573eb 100755
--- a/includes/discovery/cisco-cef.inc.php
+++ b/includes/discovery/cisco-cef.inc.php
@@ -4,7 +4,7 @@ echo("Cisco CEF Switching Path: ");
$cefs = array();
$cefs = snmpwalk_cache_threepart_oid($device, "CISCO-CEF-MIB::cefSwitchingPath", $cefs);
-if ($debug) { print_r($cefs); }
+if (1||$debug) { print_r($cefs); }
if (is_array($cefs))
{