diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index 4c8dad57..ad2f00d2 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -33,6 +33,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
    AND dp.port !~* 'vlan'
    AND (dp.type IS NULL OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
    AND (dp.name IS NULL OR dp.name !~* 'vlan')
+   AND (dp.is_master = 'false' OR dp.slave_of IS NOT NULL)
    AND dp.ip <= di.ip
  GROUP BY left_ip, left_dns, left_name, right_ip, right_dns, right_name
  ORDER BY dp.ip
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm b/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
index 0d843e2c..520c2b4c 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
@@ -11,12 +11,13 @@ __PACKAGE__->table('device_port_speed');
 __PACKAGE__->result_source_instance->is_virtual(1);
 __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
   SELECT ip,
-         sum( COALESCE(dpp.raw_speed,1) ) as total
+         GREATEST(1, sum( COALESCE(dpp.raw_speed,1) )) as total
   FROM device_port
   LEFT OUTER JOIN device_port_properties dpp USING (ip, port)
   WHERE port !~* 'vlan'
     AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
     AND (name IS NULL OR name !~* 'vlan')
+    AND (is_master = 'false' OR slave_of IS NOT NULL)
   GROUP BY ip
   ORDER BY total DESC, ip ASC
 ENDSQL
diff --git a/lib/App/Netdisco/Util/Node.pm b/lib/App/Netdisco/Util/Node.pm
index ca6d4eed..7cc832bc 100644
--- a/lib/App/Netdisco/Util/Node.pm
+++ b/lib/App/Netdisco/Util/Node.pm
@@ -65,6 +65,8 @@ MAC address does not belong to an interface on any known Device
 
 sub check_mac {
   my ($device, $node, $port_macs) = @_;
+  return 0 if !$device or !$node;
+
   my $mac = NetAddr::MAC->new(mac => $node);
   my $devip = (ref $device ? $device->ip : '');
   $port_macs ||= {};