diff --git a/sdk/factory/mastercopyDeployer.ts b/sdk/factory/mastercopyDeployer.ts
index 3ebef99a..e27634ff 100644
--- a/sdk/factory/mastercopyDeployer.ts
+++ b/sdk/factory/mastercopyDeployer.ts
@@ -106,7 +106,7 @@ export const deployMastercopyWithInitData = async (
   const initCodeHash = keccak256(initCode);
 
   const computedTargetAddress = getCreate2Address(
-    await singletonFactory.address(),
+    await singletonFactory.getAddress(),
     salt,
     initCodeHash
   );
diff --git a/sdk/factory/singletonFactory.ts b/sdk/factory/singletonFactory.ts
index 4531356d..e3e6bb86 100644
--- a/sdk/factory/singletonFactory.ts
+++ b/sdk/factory/singletonFactory.ts
@@ -33,10 +33,12 @@ export const getSingletonFactory = async (
       "Singleton factory is not deployed on this chain. Deploying singleton factory..."
     );
     // fund the singleton factory deployer account
-    await signer.sendTransaction({
-      to: singletonDeployer,
-      value: parseEther("0.0247"),
-    });
+    await (
+      await signer.sendTransaction({
+        to: singletonDeployer,
+        value: parseEther("0.0247"),
+      })
+    ).wait();
 
     // deploy the singleton factory
     await (
diff --git a/tasks/deploy-replay.ts b/tasks/deploy-replay.ts
index 772026fe..d5b6ea41 100644
--- a/tasks/deploy-replay.ts
+++ b/tasks/deploy-replay.ts
@@ -17,7 +17,7 @@ export const deploy = async (_: unknown, hre: HardhatRuntimeEnvironment) => {
   console.log(`\n\x1B[4m\x1B[1m${hre.network.name}\x1B[0m`);
 
   const [deployer] = await hre.ethers.getSigners();
-  const signer = hre.ethers.provider.getSigner(deployer.address);
+  const signer = await hre.ethers.provider.getSigner(deployer.address);
   for (let index = 0; index < contracts.length; index++) {
     const initData: InitData | undefined = MasterCopyInitData[contracts[index]];
 
diff --git a/tasks/singleton-deployment.ts b/tasks/singleton-deployment.ts
index 5e28fde0..46697789 100644
--- a/tasks/singleton-deployment.ts
+++ b/tasks/singleton-deployment.ts
@@ -16,7 +16,7 @@ export const deploy = async (_: unknown, hre: HardhatRuntimeEnvironment) => {
   }
 
   const [deployer] = await hre.ethers.getSigners();
-  await deployModuleFactory(hre.ethers.provider.getSigner(deployer.address));
+  await deployModuleFactory(await hre.ethers.provider.getSigner(deployer.address));
 };
 
 task(