diff --git a/scripts/deploy/scripts/configureSocket.ts b/scripts/deploy/scripts/configureSocket.ts
index 2658a14d..b9a981a5 100644
--- a/scripts/deploy/scripts/configureSocket.ts
+++ b/scripts/deploy/scripts/configureSocket.ts
@@ -74,9 +74,10 @@ export const setManagers = async (
   ) {
     const transaction = {
       to: socket.address,
-      data: socket.encodeFunctionData("setExecutionManager(address)", [
-        addr[executionManagerVersion],
-      ]),
+      data: socket.interface.encodeFunctionData(
+        "setExecutionManager(address)",
+        [addr[executionManagerVersion]]
+      ),
       ...(await overrides(await socketSigner.getChainId())),
     };
 
@@ -94,7 +95,7 @@ export const setManagers = async (
   if (currentTM.toLowerCase() !== addr.TransmitManager?.toLowerCase()) {
     const transaction = {
       to: socket.address,
-      data: socket.encodeFunctionData("setTransmitManager(address)", [
+      data: socket.interface.encodeFunctionData("setTransmitManager(address)", [
         addr.TransmitManager,
       ]),
       ...(await overrides(await socketSigner.getChainId())),
@@ -161,6 +162,7 @@ export const configureExecutionManager = async (
       siblingsToConfigure.push(siblingSlug);
     });
 
+    let requests: any = [];
     await Promise.all(
       siblingsToConfigure.map(async (siblingSlug) => {
         const digest = keccak256(
@@ -178,24 +180,35 @@ export const configureExecutionManager = async (
         );
 
         const signature = await socketSigner.signMessage(arrayify(digest));
-        signatureMap.set(siblingSlug, signature);
+        let request = {
+          signature,
+          dstChainSlug: siblingSlug,
+          nonce: nextNonce++,
+          perGasCost: 0,
+          perByteCost: 0,
+          overhead: 0,
+          fees: msgValueMaxThreshold(siblingSlug),
+          functionSelector: "0xa1885700", // setMsgValueMaxThreshold
+        };
+        requests.push(request);
+        // signatureMap.set(siblingSlug, signature);
       })
     );
 
-    let requests: any = [];
-    siblingsToConfigure.sort().map((siblingSlug) => {
-      let request = {
-        signature: signatureMap.get(siblingSlug),
-        dstChainSlug: siblingSlug,
-        nonce: nextNonce++,
-        perGasCost: 0,
-        perByteCost: 0,
-        overhead: 0,
-        fees: msgValueMaxThreshold(siblingSlug),
-        functionSelector: "0xa1885700", // setMsgValueMaxThreshold
-      };
-      requests.push(request);
-    });
+    // let requests: any = [];
+    // siblingsToConfigure.sort().map((siblingSlug) => {
+    //   let request = {
+    //     signature: signatureMap.get(siblingSlug),
+    //     dstChainSlug: siblingSlug,
+    //     nonce: nextNonce++,
+    //     perGasCost: 0,
+    //     perByteCost: 0,
+    //     overhead: 0,
+    //     fees: msgValueMaxThreshold(siblingSlug),
+    //     functionSelector: "0xa1885700", // setMsgValueMaxThreshold
+    //   };
+    //   requests.push(request);
+    // });
 
     if (requests.length === 0) return;
 
@@ -261,9 +274,10 @@ export const setupPolygonNativeSwitchboard = async (addresses, safeChains) => {
 
           transaction = {
             to: sbContract.address,
-            data: sbContract.encodeFunctionData("setFxChildTunnel(address)", [
-              dstSwitchboardAddress,
-            ]),
+            data: sbContract.interface.encodeFunctionData(
+              "setFxChildTunnel(address)",
+              [dstSwitchboardAddress]
+            ),
             ...(await overrides(await socketSigner.getChainId())),
           };
         } else if (srcSwitchboardType === NativeSwitchboard.POLYGON_L2) {
@@ -279,9 +293,10 @@ export const setupPolygonNativeSwitchboard = async (addresses, safeChains) => {
 
           transaction = {
             to: sbContract.address,
-            data: sbContract.encodeFunctionData("setFxRootTunnel(address)", [
-              dstSwitchboardAddress,
-            ]),
+            data: sbContract.interface.encodeFunctionData(
+              "setFxRootTunnel(address)",
+              [dstSwitchboardAddress]
+            ),
             ...(await overrides(await socketSigner.getChainId())),
           };
         }
diff --git a/scripts/deploy/scripts/connect.ts b/scripts/deploy/scripts/connect.ts
index c807fd74..dd89faa2 100644
--- a/scripts/deploy/scripts/connect.ts
+++ b/scripts/deploy/scripts/connect.ts
@@ -72,7 +72,7 @@ export const connectPlugs = async (
               addresses,
               chain,
               sibling,
-              siblingIntegrationType[index]
+              siblingIntegrationtype[index]
             );
           } catch (error) {
             console.log(error, " continuing");
@@ -100,7 +100,7 @@ export const connectPlugs = async (
           );
 
           console.log(
-            `Connecting counter of ${chain} for ${sibling} and ${siblingIntegrationType[index]} at tx hash: ${tx.hash}`
+            `Connecting counter of ${chain} for ${sibling} and ${siblingIntegrationtype[index]} at tx hash: ${tx.hash}`
           );
           await tx.wait();
         }
diff --git a/scripts/deploy/scripts/registerSwitchboard.ts b/scripts/deploy/scripts/registerSwitchboard.ts
index 95d1ffda..b1940959 100644
--- a/scripts/deploy/scripts/registerSwitchboard.ts
+++ b/scripts/deploy/scripts/registerSwitchboard.ts
@@ -36,7 +36,7 @@ export default async function registerSwitchboardForSibling(
     if (capacitor === constants.AddressZero) {
       const transaction = {
         to: switchboard.address,
-        data: switchboard.encodeFunctionData(
+        data: switchboard.interface.encodeFunctionData(
           "registerSiblingSlug(uint32,uint256,uint256,uint256,address)",
           [
             remoteChainSlug,