diff --git a/llarp/aligned.hpp b/llarp/aligned.hpp
index ca7a5fd9e..ae93cb8f5 100644
--- a/llarp/aligned.hpp
+++ b/llarp/aligned.hpp
@@ -206,16 +206,6 @@ namespace llarp
       return as_array().data();
     }
 
-    operator const Data&() const
-    {
-      return as_array();
-    }
-
-    operator Data&()
-    {
-      return as_array();
-    }
-
     typename Data::iterator
     begin()
     {
diff --git a/llarp/dht/publish_intro.cpp b/llarp/dht/publish_intro.cpp
index 249cd06cb..9f1cc3c90 100644
--- a/llarp/dht/publish_intro.cpp
+++ b/llarp/dht/publish_intro.cpp
@@ -65,7 +65,7 @@ namespace llarp
         return true;
       }
       llarp::dht::Key_t addr;
-      if(!I.A.CalculateAddress(addr))
+      if(!I.A.CalculateAddress(addr.as_array()))
       {
         llarp::LogWarn(
             "failed to calculate hidden service address for PubIntro message");
diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp
index d75d267e4..2321d1b7e 100644
--- a/llarp/handlers/tun.cpp
+++ b/llarp/handlers/tun.cpp
@@ -343,7 +343,7 @@ namespace llarp
       {
         // XXX is calling inet_ntoa safe in this context? it's MP-unsafe
         llarp::LogWarn(ip, " already mapped to ",
-                       service::Address(itr->second).ToString());
+                       service::Address(itr->second.as_array()).ToString());
         return false;
       }
       llarp::LogInfo(Name() + " map ", addr.ToString(), " to ", ip);
@@ -555,7 +555,7 @@ namespace llarp
     }
 
     huint32_t
-    TunEndpoint::ObtainIPForAddr(const AlignedBuffer< 32 >& addr, bool snode)
+    TunEndpoint::ObtainIPForAddr(const AlignedBuffer< 32 > &addr, bool snode)
     {
       llarp_time_t now = Now();
       huint32_t nextIP = {0};
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 841e40764..d41b15d23 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1164,7 +1164,7 @@ namespace llarp
     Endpoint::SendToServiceOrQueue(const RouterID& addr, llarp_buffer_t data,
                                    ProtocolType t)
     {
-      service::Address remote(addr);
+      service::Address remote(addr.as_array());
 
       // inbound converstation
       auto now = Now();