diff --git a/contracts/main/CurveStableSwapMetaNG.vy b/contracts/main/CurveStableSwapMetaNG.vy
index 80ac4b1e..508542a7 100644
--- a/contracts/main/CurveStableSwapMetaNG.vy
+++ b/contracts/main/CurveStableSwapMetaNG.vy
@@ -334,7 +334,11 @@ def __init__(
         if i < BASE_N_COINS:
             # Approval needed for add_liquidity operation on base pool in
             # _exchange_underlying:
-            ERC20(_base_coins[i]).approve(BASE_POOL, max_value(uint256))
+            ERC20(_base_coins[i]).approve(
+                BASE_POOL,
+                max_value(uint256),
+                default_return_value = True
+            )
 
     # For ERC4626 tokens:
     if asset_types[0] == 3:
diff --git a/poetry.lock b/poetry.lock
index 79c9e2cb..0a56f54e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -4136,8 +4136,8 @@ forking-recommended = ["ujson"]
 [package.source]
 type = "git"
 url = "https://github.com/vyperlang/titanoboa.git"
-reference = "1924f4888e2ef261efb2367fce2cf467de16f529"
-resolved_reference = "1924f4888e2ef261efb2367fce2cf467de16f529"
+reference = "b5e9fb96d1424ed5cc5a6af03391d885439c83e5"
+resolved_reference = "b5e9fb96d1424ed5cc5a6af03391d885439c83e5"
 
 [[package]]
 name = "tomli"
@@ -4805,4 +4805,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "4bfbf4bf7da0af835da1d07294f58a9bf4b5de283abb2957e2a2ae24d625726a"
+content-hash = "4c5b91e040b8a6e4e32780c15ee09a8f358b5d1dda054625320c40f163f72a61"
diff --git a/pyproject.toml b/pyproject.toml
index 8c34534c..08495a71 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ packages = []
 [tool.poetry.dependencies]
 python = "^3.10"
 poetry = "1.5.1"
-titanoboa = {git = "https://github.com/vyperlang/titanoboa.git", rev = "1924f4888e2ef261efb2367fce2cf467de16f529"}
+titanoboa = {git = "https://github.com/vyperlang/titanoboa.git", rev = "b5e9fb96d1424ed5cc5a6af03391d885439c83e5"}
 vyper = "0.3.10"
 pycryptodome = "^3.18.0"
 pre-commit = "^3.3.3"
diff --git a/scripts/deploy_infra.py b/scripts/deploy_infra.py
index f63427ff..33e80969 100644
--- a/scripts/deploy_infra.py
+++ b/scripts/deploy_infra.py
@@ -24,7 +24,7 @@
         "math": "0x20D1c021525C85D9617Ccc64D8f547d5f730118A",
         "views": "0x87DD13Dd25a1DBde0E1EdcF5B8Fa6cfff7eABCaD",
         "plain_amm": "0x3E3B5F27bbf5CC967E074b70E9f4046e31663181",
-        "meta_amm": "0x19bd1AB34d6ABB584b9C1D5519093bfAA7f6c7d2",
+        "meta_amm": "0x64AFA95e0C3D8410240a4262df9Fd82B12b64eDd",
         "factory": "0x6A8cbed756804B16E05E741eDaBd5cB544AE21bf",
         "gauge": "0xF5617D4f7514bE35fce829a1C19AE7f6c9106979",
     },
@@ -193,6 +193,7 @@ def deploy_infra(network, url, account, fork=False):
     if fork:
         boa.env.fork(url)
         logger.log("Forkmode ...")
+        boa.env.eoa = deploy_utils.FIDDYDEPLOYER  # set eoa address here
     else:
         logger.log("Prodmode ...")
         boa.set_env(NetworkEnv(url))
@@ -261,7 +262,7 @@ def main():
 
     deploy_infra(
         "ethereum:mainnet",
-        os.environ["RPC_ETHEREUM"],
+        "http://localhost:9090",
         "FIDDYDEPLOYER",
         fork=False,
     )