diff --git a/external/keyring-manager b/external/keyring-manager
index 1295d708..935ca957 160000
--- a/external/keyring-manager
+++ b/external/keyring-manager
@@ -1 +1 @@
-Subproject commit 1295d708ec42542f076a13db69eadc448a94f985
+Subproject commit 935ca957d7e223ef560a0b20b656730a325e0ba7
diff --git a/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs b/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs
index 8233c81c..9efb91c4 100644
--- a/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs
+++ b/veilid-core/src/intf/native/utils/network_interfaces/netlink.rs
@@ -9,7 +9,7 @@ use libc::{
 };
 use rtnetlink::packet::{
     nlas::address::Nla, AddressMessage, AF_INET, AF_INET6, IFA_F_DADFAILED, IFA_F_DEPRECATED,
-    IFA_F_PERMANENT, IFA_F_TEMPORARY, IFA_F_TENTATIVE,
+    IFA_F_OPTIMISTIC, IFA_F_PERMANENT, IFA_F_TEMPORARY, IFA_F_TENTATIVE,
 };
 use rtnetlink::{new_connection_with_socket, sys::SmolSocket, Handle, IpVersion};
 use std::convert::TryInto;
@@ -47,7 +47,9 @@ fn flags_to_address_flags(flags: u32) -> AddressFlags {
     AddressFlags {
         is_temporary: (flags & IFA_F_TEMPORARY) != 0,
         is_dynamic: (flags & IFA_F_PERMANENT) == 0,
-        is_preferred: (flags & (IFA_F_TENTATIVE | IFA_F_DADFAILED | IFA_F_DEPRECATED | IFA_F_OPTIMISTIC)  ) == 0,
+        is_preferred: (flags
+            & (IFA_F_TENTATIVE | IFA_F_DADFAILED | IFA_F_DEPRECATED | IFA_F_OPTIMISTIC))
+            == 0,
     }
 }
 
diff --git a/veilid-server/src/client_api.rs b/veilid-server/src/client_api.rs
index d7da5653..20b3a3b1 100644
--- a/veilid-server/src/client_api.rs
+++ b/veilid-server/src/client_api.rs
@@ -154,7 +154,7 @@ impl veilid_server::Server for VeilidServerImpl {
                 assert!(false, "write me!");
             }
             else {
-                crate::unix::shutdown();
+                crate::server::shutdown();
             }
         }
 
diff --git a/veilid-server/src/unix.rs b/veilid-server/src/unix.rs
index a356c017..742f1671 100644
--- a/veilid-server/src/unix.rs
+++ b/veilid-server/src/unix.rs
@@ -1,21 +1,8 @@
-use crate::client_api;
-use crate::client_log_channel::*;
-use crate::settings;
-use async_std::channel::{bounded, Receiver, Sender};
-use clap::{App, Arg};
-use lazy_static::*;
-use log::*;
-use parking_lot::Mutex;
-use simplelog::*;
-use std::ffi::OsStr;
-use std::fs::OpenOptions;
-use std::path::Path;
-use std::str::FromStr;
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-use veilid_core::xx::SingleShotEventual;
+use crate::settings::Settings;
+use clap::ArgMatches;
+// use log::*;
 
-pub fn run_daemon(settings: Settings, matches: ArgMatches) -> Result<(), String> {
+pub fn run_daemon(_settings: Settings, _matches: ArgMatches) -> Result<(), String> {
     eprintln!("Windows Service mode not implemented yet.");
     Ok(())
 }