diff --git a/src/accounts/erc7579/ERC7579Factory.sol b/src/accounts/erc7579/ERC7579Factory.sol
index 7aef36b2..1851635e 100644
--- a/src/accounts/erc7579/ERC7579Factory.sol
+++ b/src/accounts/erc7579/ERC7579Factory.sol
@@ -17,7 +17,7 @@ contract ERC7579Factory is IAccountFactory, ERC7579Precompiles {
 
     function init() public override {
         implementation = deployERC7579Account();
-        bootstrapDefault = IERC7579Bootstrap(deployERC7579Bootstrap());
+        bootstrapDefault = deployERC7579Bootstrap();
     }
 
     function createAccount(bytes32 salt, bytes memory initCode) public override returns (address) {
diff --git a/src/accounts/kernel/KernelFactory.sol b/src/accounts/kernel/KernelFactory.sol
index f615cebd..75e746b2 100644
--- a/src/accounts/kernel/KernelFactory.sol
+++ b/src/accounts/kernel/KernelFactory.sol
@@ -19,7 +19,7 @@ contract KernelFactory is IAccountFactory, KernelPrecompiles {
     MockHookMultiPlexer public hookMultiPlexer;
 
     function init() public override {
-        kernelImpl = IKernel(deployKernel(ENTRYPOINT_ADDR));
+        kernelImpl = deployKernel(ENTRYPOINT_ADDR);
         factory = deployKernelFactory(address(kernelImpl));
         hookMultiPlexer = new MockHookMultiPlexer();
     }
diff --git a/src/accounts/safe/SafeFactory.sol b/src/accounts/safe/SafeFactory.sol
index 8d5242f2..e9711e8f 100644
--- a/src/accounts/safe/SafeFactory.sol
+++ b/src/accounts/safe/SafeFactory.sol
@@ -26,8 +26,8 @@ contract SafeFactory is IAccountFactory, Safe7579Precompiles {
     SafeProxyFactory internal safeProxyFactory;
 
     function init() public override {
-        safe7579 = ISafe7579(deploySafe7579());
-        launchpad = ISafe7579Launchpad(deploySafe7579Launchpad(ENTRYPOINT_ADDR, REGISTRY_ADDR));
+        safe7579 = deploySafe7579();
+        launchpad = deploySafe7579Launchpad(ENTRYPOINT_ADDR, REGISTRY_ADDR);
         safeSingleton = new Safe();
         safeProxyFactory = new SafeProxyFactory();
     }