diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index c0ea7de9a..9babd4b22 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -209,27 +209,19 @@ $config['bad_if'][] = "voip-null";
 $config['bad_if'][] = "virtual-";
 $config['bad_if'][] = "unrouted";
 $config['bad_if'][] = "eobc";
-$config['bad_if'][] = "mpls";
 $config['bad_if'][] = "lp0";
-$config['bad_if'][] = "faith0";
-$config['bad_if'][] = "-atm layer";
-$config['bad_if'][] = "-atm subif";
-$config['bad_if'][] = "-shdsl";
-$config['bad_if'][] = "-aal5";
 $config['bad_if'][] = "-atm";
+$config['bad_if'][] = "faith0";
 $config['bad_if'][] = "container";
 $config['bad_if'][] = "async";
 $config['bad_if'][] = "plip";
 $config['bad_if'][] = "-physical";
 $config['bad_if'][] = "container";
 $config['bad_if'][] = "unrouted";
-$config['bad_if'][] = "bri";
-$config['bad_if'][] = "-bearer";
 $config['bad_if'][] = "bluetooth";
 $config['bad_if'][] = "isatap";
 $config['bad_if'][] = "ras";
 $config['bad_if'][] = "qos";
-$config['bad_if'][] = "sonet/sdh";
 $config['bad_if'][] = "span rp";
 $config['bad_if'][] = "span sp";
 $config['bad_if'][] = "sslvpn";
@@ -249,6 +241,11 @@ $config['bad_iftype'][] = "ds1";
 $config['bad_iftype'][] = "ds3";
 #$config['bad_iftype'][] = "isdn";     #show signaling traffic
 #$config['bad_iftype'][] = "lapd";      #show signaling traffic
+$config['bad_iftype'][] = "sonet";
+$config['bad_iftype'][] = "atmSubInterface";
+$config['bad_iftype'][] = "aal5";
+$config['bad_iftype'][] = "shdsl";
+$config['bad_iftype'][] = "mpls";
 $config['bad_if_regexp'][] = "/^ng[0-9]+$/";
 $config['bad_if_regexp'][] = "/^sl[0-9]/";
 
diff --git a/includes/polling/unix-agent.inc.php b/includes/polling/unix-agent.inc.php
index 5d14cacdb..9369e7377 100755
--- a/includes/polling/unix-agent.inc.php
+++ b/includes/polling/unix-agent.inc.php
@@ -97,13 +97,13 @@ if(!empty($agent_raw))
           dbInsert(array('device_id' => $device['device_id'], 'name' => $name, 'manager' => $manager,
                        'status' => 1, 'version' => $version, 'build' => $build, 'arch' => $arch, 'size' => $size), 'packages');
           echo("+".$name."-".$version."-".$build."-".$arch);
-	  log_event('Package installed: '.$name.' '.$arch.' version '.$version.'-'.$build.' '.$arch, $device, 'package');
+	  log_event('Package installed: '.$name.' ('.$arch.') version '.$version.'-'.$build, $device, 'package');
         } elseif(count($pkgs_db[$manager][$name][$arch], 1)) {
           $pkg_c = dbFetchRow("SELECT * FROM `packages` WHERE `device_id` = ? AND `manager` = ? AND `name` = ? and `arch` = ? ORDER BY version DESC, build DESC", array($device['device_id'], $manager, $name, $arch));
 	  echo("U(".$pkg_c['name']."-".$pkg_c['version']."-".$pkg_c['build']."|".$name."-".$version."-".$build.")");
           $pkg_update = array('version' => $version, 'build' => $build, 'status' => '1', 'size' => $size);
 	  dbUpdate($pkg_update, 'packages', '`pkg_id` = ?', array($pkg_c['pkg_id']));
-	  log_event('Package updated: '.$name.' '.$arch.' from '.$version.'-'.$build.' to '.$pkg_c['version'].'-'.$pkg_c['build'], $device, 'package');
+	  log_event('Package updated: '.$name.' ('.$arch.') from '.$pkg_c['version'].'-'.$pkg_c['build'] .' to '.$version.'-'.$build, $device, 'package');
           unset($pkgs_db_id[$pkg_c['pkg_id']]);
         }
       }