diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index 8ac82e6c..4eba23f9 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -221,7 +221,7 @@ sub store_interfaces {
 
       if (not $port) {
           debug sprintf ' [%s] interfaces - ignoring %s (no port mapping)',
-            $device->ip, $port;
+            $device->ip, $entry;
           next;
       }
 
@@ -336,7 +336,7 @@ sub store_wireless {
 
       if (not $port) {
           debug sprintf ' [%s] wireless - ignoring %s (no port mapping)',
-            $device->ip, $port;
+            $device->ip, $iid;
           next;
       }
 
@@ -364,7 +364,7 @@ sub store_wireless {
 
       if (not $port) {
           debug sprintf ' [%s] wireless - ignoring %s (no port mapping)',
-            $device->ip, $port;
+            $device->ip, $entry;
           next;
       }
 
diff --git a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
index 100e9b9f..1f9bb2eb 100644
--- a/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Macsuck.pm
@@ -36,7 +36,7 @@ Given a Device database object, and a working SNMP connection, connect to a
 device and discover the MAC addresses listed against each physical port
 without a neighbor.
 
-If the device has VLANs, C<do_macsuck> will walk each VALN to get the MAC
+If the device has VLANs, C<do_macsuck> will walk each VLAN to get the MAC
 addresses from there.
 
 It will also gather wireless client information if C<store_wireless_clients>