diff --git a/jito_geyser/pyproject.toml b/jito_geyser/pyproject.toml
index a881571..b37bb20 100644
--- a/jito_geyser/pyproject.toml
+++ b/jito_geyser/pyproject.toml
@@ -13,8 +13,8 @@ protobuf = "^4.21.12"
 isort = "^5.11.4"
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [tool.poetry-grpc-plugin]
 proto_path = "../geyser-grpc-plugin/proto/proto"
diff --git a/jito_searcher_client/jito_searcher_client/async_searcher.py b/jito_searcher_client/jito_searcher_client/async_searcher.py
index 263e146..e3f4d10 100644
--- a/jito_searcher_client/jito_searcher_client/async_searcher.py
+++ b/jito_searcher_client/jito_searcher_client/async_searcher.py
@@ -59,10 +59,10 @@ async def intercept_unary_stream(
         if self._kp != None:
             await self.authenticate_if_needed()
 
-        client_call_details = self._insert_headers(
-            [("authorization", f"Bearer {self._access_token.token}")],
-            client_call_details,
-        )
+            client_call_details = self._insert_headers(
+                [("authorization", f"Bearer {self._access_token.token}")],
+                client_call_details,
+            )
 
         call = await continuation(client_call_details, request)
 
@@ -77,10 +77,10 @@ async def intercept_unary_unary(
         if self._kp != None:
             await self.authenticate_if_needed()
 
-        client_call_details = self._insert_headers(
-            [("authorization", f"Bearer {self._access_token.token}")],
-            client_call_details,
-        )
+            client_call_details = self._insert_headers(
+                [("authorization", f"Bearer {self._access_token.token}")],
+                client_call_details,
+            )
 
         undone_call = await continuation(client_call_details, request)
         response = await undone_call
@@ -173,7 +173,8 @@ async def get_async_searcher_client(url: str, kp: Keypair=None) -> SearcherServi
     """
     # Authenticate immediately
     searcher_interceptor = AsyncSearcherInterceptor(url, kp)
-    await searcher_interceptor.authenticate_if_needed()
+    if kp != None:
+        await searcher_interceptor.authenticate_if_needed()
 
     credentials = ssl_channel_credentials()
     channel = secure_channel(url, credentials, interceptors=[searcher_interceptor])
diff --git a/jito_searcher_client/pyproject.toml b/jito_searcher_client/pyproject.toml
index 4e91923..ac7c640 100644
--- a/jito_searcher_client/pyproject.toml
+++ b/jito_searcher_client/pyproject.toml
@@ -15,8 +15,8 @@ click = "^8.1.3"
 solana = "0.34.0"
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [tool.poetry-grpc-plugin]
 proto_path = "../mev-protos"