diff --git a/tests/testlib/wakucore.nim b/tests/testlib/wakucore.nim
index c5e16d03a..0c5b5199d 100644
--- a/tests/testlib/wakucore.nim
+++ b/tests/testlib/wakucore.nim
@@ -38,7 +38,7 @@ proc newTestSwitch*(
 ): Switch =
   let peerKey = key.get(generateSecp256k1Key())
   let peerAddr = address.get(MultiAddress.init("/ip4/127.0.0.1/tcp/0").get())
-  return newStandardSwitch(some(peerKey), addrs = peerAddr)
+  return newStandardSwitch(privKey = Opt.some(peerKey), addrs = peerAddr)
 
 # Waku message
 
diff --git a/tests/wakunode_rest/test_rest_store.nim b/tests/wakunode_rest/test_rest_store.nim
index f08ed0a17..b8882328b 100644
--- a/tests/wakunode_rest/test_rest_store.nim
+++ b/tests/wakunode_rest/test_rest_store.nim
@@ -107,7 +107,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     peerSwitch.mount(node.wakuStore)
@@ -185,7 +185,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     peerSwitch.mount(node.wakuStore)
@@ -255,7 +255,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     peerSwitch.mount(node.wakuStore)
@@ -351,7 +351,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     peerSwitch.mount(node.wakuStore)
@@ -425,7 +425,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     peerSwitch.mount(node.wakuStore)
@@ -515,7 +515,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     peerSwitch.mount(node.wakuStore)
@@ -566,7 +566,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     let client = newRestHttpClient(initTAddress(restAddress, restPort))
@@ -750,7 +750,7 @@ procSuite "Waku Rest API - Store v3":
     node.mountStoreClient()
 
     let key = generateEcdsaKey()
-    var peerSwitch = newStandardSwitch(some(key))
+    var peerSwitch = newStandardSwitch(Opt.some(key))
     await peerSwitch.start()
 
     peerSwitch.mount(node.wakuStore)
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 59e7069c1..aa8ce46f7 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 59e7069c15e914618b7f7b2206c47d16c5d10a34
+Subproject commit aa8ce46f782240cb99a7222c474022b8cfd24e52
diff --git a/waku/waku_rendezvous/protocol.nim b/waku/waku_rendezvous/protocol.nim
index f8ff1e23d..876082210 100644
--- a/waku/waku_rendezvous/protocol.nim
+++ b/waku/waku_rendezvous/protocol.nim
@@ -77,7 +77,7 @@ proc batchAdvertise*(
       conn
 
   let advertCatch = catch:
-    await self.rendezvous.advertise(namespace, ttl, peers)
+    await self.rendezvous.advertise(namespace, Opt.some(ttl))
 
   for conn in conns:
     await conn.close()
@@ -126,7 +126,7 @@ proc batchRequest*(
       conn
 
   let reqCatch = catch:
-    await self.rendezvous.request(Opt.some(namespace), count, peers)
+    await self.rendezvous.request(Opt.some(namespace), Opt.some(count), Opt.some(peers))
 
   for conn in conns:
     await conn.close()