diff --git a/llarp/messages/path_confirm.hpp b/llarp/messages/path_confirm.hpp
index 773f3f08e..ced16e337 100644
--- a/llarp/messages/path_confirm.hpp
+++ b/llarp/messages/path_confirm.hpp
@@ -25,11 +25,7 @@ namespace llarp
       HandleMessage(IMessageHandler* h, llarp::Router* r) const override;
 
       void
-      Clear() override
-      {
-        pathLifetime = 0;
-        pathCreated  = 0;
-      };
+      Clear() override{};
     };
   }  // namespace routing
 }  // namespace llarp
diff --git a/llarp/messages/path_latency.hpp b/llarp/messages/path_latency.hpp
index ff78f1bf5..6801b4f2c 100644
--- a/llarp/messages/path_latency.hpp
+++ b/llarp/messages/path_latency.hpp
@@ -20,11 +20,7 @@ namespace llarp
       DecodeKey(llarp_buffer_t key, llarp_buffer_t* val) override;
 
       void
-      Clear() override
-      {
-        T = 0;
-        L = 0;
-      };
+      Clear() override{};
 
       bool
       HandleMessage(IMessageHandler* h, llarp::Router* r) const override;
diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp
index 66f2202ec..9e185437c 100644
--- a/llarp/router/router.cpp
+++ b/llarp/router/router.cpp
@@ -17,6 +17,7 @@
 
 #include <fstream>
 #include <cstdlib>
+#include <iterator>
 #if defined(RPI) || defined(ANDROID)
 #include <unistd.h>
 #endif
diff --git a/llarp/service/tag.hpp b/llarp/service/tag.hpp
index 34ff8781c..82ce480fa 100644
--- a/llarp/service/tag.hpp
+++ b/llarp/service/tag.hpp
@@ -28,7 +28,8 @@ namespace llarp
       {
         // evidently, does nothing on LP64 systems (where size_t is *already*
         // unsigned long but zero-extends this on LLP64 systems
-        std::copy(str.begin(), str.begin() + std::min(16UL, str.size()),
+        // 2Jan19: reeee someone undid the patch
+        std::copy(str.begin(), str.begin() + std::min(std::string::size_type(16), str.size()),
                   begin());
       }
 
@@ -42,7 +43,7 @@ namespace llarp
       Tag&
       operator=(const std::string& str)
       {
-        std::copy(str.begin(), str.begin() + std::min(16UL, str.size()),
+        std::copy(str.begin(), str.begin() + std::min(std::string::size_type(16), str.size()),
                   begin());
         return *this;
       }