diff --git a/llarp/path/path.cpp b/llarp/path/path.cpp
index 0291da07f..bcee180dc 100644
--- a/llarp/path/path.cpp
+++ b/llarp/path/path.cpp
@@ -31,14 +31,15 @@ namespace llarp
       for(size_t idx = 0; idx < hsz; ++idx)
       {
         hops[idx].rc = h[idx];
-        while(hops[idx].txID.IsZero())
+        do
         {
           hops[idx].txID.Randomize();
-        }
-        while(hops[idx].rxID.IsZero())
+        } while(hops[idx].txID.IsZero());
+
+        do
         {
           hops[idx].rxID.Randomize();
-        }
+        } while(hops[idx].rxID.IsZero());
       }
 
       for(size_t idx = 0; idx < hsz - 1; ++idx)
diff --git a/llarp/router/outbound_message_handler.cpp b/llarp/router/outbound_message_handler.cpp
index 373ef2d2d..76c738756 100644
--- a/llarp/router/outbound_message_handler.cpp
+++ b/llarp/router/outbound_message_handler.cpp
@@ -308,7 +308,7 @@ namespace llarp
     }
 
     size_t sent_count = 0;
-    if (roundRobinOrder.empty())
+    if(roundRobinOrder.empty())
     {
       return;
     }
diff --git a/llarp/router/outbound_message_handler.hpp b/llarp/router/outbound_message_handler.hpp
index 84e6d6f45..af18bc9d6 100644
--- a/llarp/router/outbound_message_handler.hpp
+++ b/llarp/router/outbound_message_handler.hpp
@@ -116,7 +116,7 @@ namespace llarp
         pendingSessionMessageQueues GUARDED_BY(_mutex);
 
     std::unordered_map< PathID_t, MessageQueue, PathID_t::Hash >
-        outboundMessageQueues GUARDED_BY(_mutex);
+        outboundMessageQueues;
 
     std::queue< PathID_t > roundRobinOrder;