diff --git a/Netdisco/bin/netdisco-do b/Netdisco/bin/netdisco-do
index 6d80f0eb..1337ae18 100755
--- a/Netdisco/bin/netdisco-do
+++ b/Netdisco/bin/netdisco-do
@@ -171,7 +171,7 @@ unless ($action) {
 
     renumber_device($device, $new_dev->ip);
     return ('done', sprintf 'Renumbered device %s to %s (%s).',
-      $device->ip, $new_dev->ip, ($hostname || ''));
+      $device->ip, $new_dev->ip, ($device->dns || ''));
   }
 
   sub psql {
@@ -316,7 +316,7 @@ Run an arpnip for all known devices.
 Delete a device (specified with C<-d>). Pass a log message for the action in
 the C<-e> parameter. Optionally request for associated nodes to be archived
 (rather than deleted) by setting the C<-p> parameter to "C<yes>" (mnemonic:
-U<p>reserve).
+B<p>reserve).
 
  ~netdisco/bin/netdisco-do delete -d 192.0.2.1
  ~netdisco/bin/netdisco-do delete -d 192.0.2.1 -e 'older than the sun'
@@ -350,7 +350,7 @@ Run Device and Node expiry actions according to configuration.
 =head2 expirenodes
 
 Archive nodes on the specified device. If you want to delete nodes, set the
-C<-e> parameter to "C<no>" (mnemonic: U<e>xpire). If you want to perform the
+C<-e> parameter to "C<no>" (mnemonic: B<e>xpire). If you want to perform the
 action on a specific port, set the C<-p> parameter.
 
  ~netdisco/bin/netdisco-do expirenodes -d 192.0.2.1
diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm
index f408fc59..27629725 100644
--- a/Netdisco/lib/App/Netdisco/Core/Discover.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm
@@ -140,7 +140,7 @@ sub store_device {
   my $resolved_aliases = hostnames_resolve_async(\@aliases);
 
   # fake one aliases entry for devices not providing ip_index
-  push @$resolved_aliases, { alias => $device->ip, dns => $hostname }
+  push @$resolved_aliases, { alias => $device->ip, dns => $device->dns }
     if 0 == scalar @aliases;
 
   # VTP Management Domain -- assume only one.
diff --git a/Netdisco/lib/App/Netdisco/Util/Device.pm b/Netdisco/lib/App/Netdisco/Util/Device.pm
index 05e2d7af..9d63a99d 100644
--- a/Netdisco/lib/App/Netdisco/Util/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Util/Device.pm
@@ -89,7 +89,7 @@ sub delete_device {
     schema('netdisco')->resultset('UserLog')->create({
       username => session('logged_in_user'),
       userip => scalar eval {request->remote_address},
-      event => "Delete device ". $device->ip ." ($ip)",
+      event => ("Delete device ". $device->ip),
       details => $log,
     });