diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index 60ffa0755..d1af77662 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -47,14 +47,10 @@ proc withWssTransport*(
 ): SwitchBuilder {.raises: [Defect, IOError].} =
   let key: TLSPrivateKey = getSecureKey(secureKeyPath)
   let cert: TLSCertificate = getSecureCert(secureCertPath)
-  b.withTransport(
-    proc(upgr: Upgrade, privateKey: crypto.PrivateKey): Transport =
-      WsTransport.new(
-        upgr,
-        tlsPrivateKey = key,
-        tlsCertificate = cert,
-        {TLSFlags.NoVerifyHost, TLSFlags.NoVerifyServerName},
-      )
+  b.withWsTransport(
+    tlsPrivateKey = key,
+    tlsCertificate = cert,
+    {TLSFlags.NoVerifyHost, TLSFlags.NoVerifyServerName}, # THIS IS INSECURE, NO?
   )
 
 proc newWakuSwitch*(
diff --git a/waku/waku_rendezvous/protocol.nim b/waku/waku_rendezvous/protocol.nim
index abc684e4a..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)
+    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()