diff --git a/veilid-core/src/storage_manager/mod.rs b/veilid-core/src/storage_manager/mod.rs
index 45749c24..60ae420d 100644
--- a/veilid-core/src/storage_manager/mod.rs
+++ b/veilid-core/src/storage_manager/mod.rs
@@ -734,7 +734,7 @@ impl StorageManager {
 
         let dest = rpc_processor
             .resolve_target_to_destination(
-                vc.target.clone(),
+                vc.target,
                 SafetySelection::Unsafe(Sequencing::NoPreference),
             )
             .await
diff --git a/veilid-core/src/storage_manager/record_store.rs b/veilid-core/src/storage_manager/record_store.rs
index 256107c4..8d55c00b 100644
--- a/veilid-core/src/storage_manager/record_store.rs
+++ b/veilid-core/src/storage_manager/record_store.rs
@@ -909,7 +909,7 @@ where
                     }
 
                     evcis.push(EarlyValueChangedInfo {
-                        target: w.target.clone(),
+                        target: w.target,
                         key: rtk.key,
                         subkeys,
                         count,
diff --git a/veilid-core/src/storage_manager/watch_value.rs b/veilid-core/src/storage_manager/watch_value.rs
index 097bbd1d..22344916 100644
--- a/veilid-core/src/storage_manager/watch_value.rs
+++ b/veilid-core/src/storage_manager/watch_value.rs
@@ -196,7 +196,7 @@ impl StorageManager {
                     subkeys.clone(),
                     expiration,
                     count,
-                    target.clone(),
+                    target,
                     watcher,
                 )
                 .await?;
diff --git a/veilid-core/src/veilid_api/routing_context.rs b/veilid-core/src/veilid_api/routing_context.rs
index 59ca2a46..06931c5d 100644
--- a/veilid-core/src/veilid_api/routing_context.rs
+++ b/veilid-core/src/veilid_api/routing_context.rs
@@ -3,7 +3,7 @@ use super::*;
 ///////////////////////////////////////////////////////////////////////////////////////
 
 /// Valid destinations for a message sent over a routing context
-#[derive(Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Copy, PartialOrd, Ord)]
 pub enum Target {
     /// Node by its public key
     NodeId(TypedKey),