diff --git a/src/ripple/app/misc/HashRouter.cpp b/src/ripple/app/misc/HashRouter.cpp
index fa0dc3f4d..7a5397f41 100644
--- a/src/ripple/app/misc/HashRouter.cpp
+++ b/src/ripple/app/misc/HashRouter.cpp
@@ -104,7 +104,7 @@ HashRouter::shouldRelay (uint256 const& key)
     if (!s.shouldRelay(suppressionMap_.clock().now(), holdTime_))
         return boost::none;
 
-    return std::move(s.peekPeers());
+    return s.releasePeerSet();
 }
 
 } // ripple
diff --git a/src/ripple/app/misc/HashRouter.h b/src/ripple/app/misc/HashRouter.h
index ef8dafe2e..742f49e3e 100644
--- a/src/ripple/app/misc/HashRouter.h
+++ b/src/ripple/app/misc/HashRouter.h
@@ -86,9 +86,10 @@ private:
             flags_ |= flagsToSet;
         }
 
-        std::set <PeerShortID>& peekPeers()
+        /** Return set of peers we've relayed to and reset tracking */
+        std::set<PeerShortID> releasePeerSet()
         {
-            return peers_;
+            return std::move(peers_);
         }
 
         /** Determines if this item should be relayed.
diff --git a/src/ripple/shamap/impl/SHAMap.cpp b/src/ripple/shamap/impl/SHAMap.cpp
index 5e8ba667e..3876e7c7c 100644
--- a/src/ripple/shamap/impl/SHAMap.cpp
+++ b/src/ripple/shamap/impl/SHAMap.cpp
@@ -192,13 +192,13 @@ SHAMap::walkTowardsKey(uint256 const& id, SharedPtrNodeStack* stack) const
         if (stack != nullptr)
             stack->push({inNode, nodeID});
 
-        auto const inner = std::static_pointer_cast<SHAMapInnerNode>(std::move(inNode));
         if (isv2)
         {
             auto n = std::static_pointer_cast<SHAMapInnerNodeV2>(inNode);
             if (!n->has_common_prefix(id))
                 return nullptr;
         }
+        auto const inner = std::static_pointer_cast<SHAMapInnerNode>(inNode);
         auto const branch = nodeID.selectBranch (id);
         if (inner->isEmptyBranch (branch))
             return nullptr;