diff --git a/llarp/service/outbound_context.cpp b/llarp/service/outbound_context.cpp
index 2b6c708e7..9849921a2 100644
--- a/llarp/service/outbound_context.cpp
+++ b/llarp/service/outbound_context.cpp
@@ -135,7 +135,7 @@ namespace llarp
           util::memFn(&OutboundContext::HandleHiddenServiceFrame, this));
       p->SetDropHandler(util::memFn(&OutboundContext::HandleDataDrop, this));
       // we now have a path to the next intro, swap intros
-      if(p->Endpoint() == m_NextIntro.router && remoteIntro.router.IsZero())
+      if(p->Endpoint() == m_NextIntro.router)
         SwapIntros();
     }
 
diff --git a/test/util/test_llarp_util_memfn.cpp b/test/util/test_llarp_util_memfn.cpp
index 96a7e342f..0f31df2ad 100644
--- a/test/util/test_llarp_util_memfn.cpp
+++ b/test/util/test_llarp_util_memfn.cpp
@@ -53,7 +53,7 @@ TYPED_TEST_SUITE_P(MemFnType);
 
 TYPED_TEST_P(MemFnType, Smoke)
 {
-  TypeParam foo;
+  TypeParam foo{};
   ASSERT_TRUE(util::memFn(&Foo::constEmpty, foo)());
   ASSERT_TRUE(util::memFn(&Foo::constEmpty, &foo)());
 }