diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 831836ce9..f67243cf4 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -165,7 +165,7 @@ lokinet_add_library(lokinet-dns
 # platform specific bits and bobs for setting dns
 add_library(lokinet-dns-platform INTERFACE)
 if(WITH_SYSTEMD)
-  add_library(lokinet-dns-systemd STATIC dns/nm_platform.cpp dns/sd_platform.cpp)
+  lokinet_add_library(lokinet-dns-systemd dns/nm_platform.cpp dns/sd_platform.cpp)
   target_link_libraries(lokinet-dns-platform INTERFACE lokinet-dns-systemd)
 endif()
 
@@ -222,9 +222,6 @@ target_link_libraries(lokinet-core PUBLIC lokinet-core-utils)
 
 # Link lokinet-dns to alternate libraries
 target_link_libraries(lokinet-dns PUBLIC lokinet-dns-platform)
-if (TARGET lokinet-dns-systemd)
-  target_link_libraries(lokinet-dns PUBLIC lokinet-dns-systemd)
-endif()
 
 target_link_libraries(lokinet-wire PUBLIC lokinet-time-place)
 target_link_libraries(lokinet-dns PUBLIC lokinet-utils lokinet-cryptography lokinet-config)
diff --git a/llarp/router_contact.cpp b/llarp/router_contact.cpp
index c87251adb..d57866222 100644
--- a/llarp/router_contact.cpp
+++ b/llarp/router_contact.cpp
@@ -228,7 +228,10 @@ namespace llarp
         bool decode_result = DecodeVersion_1(btlist);
 
         // advance the llarp_buffer_t since lokimq serialization is unaware of it.
-        buf->cur += btlist.current_buffer().data() - buf_view.data() + 1;
+        // FIXME: this is broken (current_buffer got dropped), but the whole thing is getting
+        // replaced.
+        // buf->cur += btlist.
+        //    current_buffer().data() - buf_view.data() + 1;
 
         return decode_result;
       }