diff --git a/llarp/buffer.cpp b/llarp/buffer.cpp
index 4e5483b7c..04935efef 100644
--- a/llarp/buffer.cpp
+++ b/llarp/buffer.cpp
@@ -101,6 +101,7 @@ llarp_buffer_put_uint32(llarp_buffer_t* buf, uint32_t i)
   buf->cur += sizeof(uint32_t);
   return true;
 }
+
 bool
 llarp_buffer_read_uint16(llarp_buffer_t* buf, uint16_t* i)
 {
@@ -111,6 +112,16 @@ llarp_buffer_read_uint16(llarp_buffer_t* buf, uint16_t* i)
   return true;
 }
 
+bool
+llarp_buffer_read_uint32(llarp_buffer_t* buf, uint32_t* i)
+{
+  if(llarp_buffer_size_left(*buf) < sizeof(uint32_t))
+    return false;
+  *i = bufbe32toh(buf->cur);
+  buf->cur += sizeof(uint32_t);
+  return true;
+}
+
 bool
 llarp_buffer_put_uint32(llarp_buffer_t* buf, uint32_t* i)
 {
diff --git a/llarp/link/server.cpp b/llarp/link/server.cpp
index 800d0d55e..05a680f58 100644
--- a/llarp/link/server.cpp
+++ b/llarp/link/server.cpp
@@ -185,7 +185,13 @@ namespace llarp
   const byte_t*
   ILinkLayer::TransportPubKey() const
   {
-    return llarp::seckey_topublic(m_SecretKey);
+    return llarp::seckey_topublic(TransportSecretKey());
+  }
+
+  const byte_t*
+  ILinkLayer::TransportSecretKey() const
+  {
+    return m_SecretKey;
   }
 
   bool
diff --git a/llarp/router.cpp b/llarp/router.cpp
index da74bf064..cad8a3124 100644
--- a/llarp/router.cpp
+++ b/llarp/router.cpp
@@ -2,7 +2,7 @@
 #include <llarp/proto.h>
 #include <llarp/iwp.hpp>
 #include <llarp/link_message.hpp>
-#include <llarp/link/curvecp.hpp>
+#include <llarp/link/utp.hpp>
 
 #include "buffer.hpp"
 #include "encode.hpp"
@@ -725,7 +725,7 @@ llarp_router::InitOutboundLink()
   if(outboundLink)
     return true;
 
-  auto link = llarp::curvecp::NewServer(this);
+  auto link = llarp::utp::NewServer(this);
 
   if(!link->EnsureKeys(transport_keyfile.string().c_str()))
   {
@@ -916,7 +916,7 @@ namespace llarp
     {
       if(!StrEq(key, "*"))
       {
-        auto server = llarp::curvecp::NewServer(self);
+        auto server = llarp::utp::NewServer(self);
         if(!server->EnsureKeys(self->transport_keyfile.string().c_str()))
         {
           llarp::LogError("failed to ensure keyfile ", self->transport_keyfile);