diff --git a/config.nims b/config.nims
index c1caa7aa14..d983be5639 100644
--- a/config.nims
+++ b/config.nims
@@ -118,7 +118,7 @@ switch("passL", "-fno-omit-frame-pointer")
 
 --threads:on
 --opt:speed
---mm:refc
+--mm:orc
 --excessiveStackTrace:on
 # enable metric collection
 --define:metrics
diff --git a/execution_chain/evm/async_evm.nim b/execution_chain/evm/async_evm.nim
index d180e405c7..f5d2eb06a5 100644
--- a/execution_chain/evm/async_evm.nim
+++ b/execution_chain/evm/async_evm.nim
@@ -168,7 +168,7 @@ proc callFetchingState(
     vmState.ledger.rollback(sp) # all state changes from the call are reverted
 
     # Collect the keys after executing the transaction
-    lastWitnessKeys = ensureMove(witnessKeys)
+    lastWitnessKeys = move(witnessKeys)
     witnessKeys = vmState.ledger.getWitnessKeys()
 
     try:
@@ -313,7 +313,7 @@ func validateSetDefaults(tx: TransactionArgs): Result[TransactionArgs, string] =
   if tx.gas.isNone():
     tx.gas = Opt.some(EVM_CALL_GAS_CAP.Quantity)
 
-  ok(ensureMove(tx))
+  ok(move(tx))
 
 proc call*(
     evm: AsyncEvm, header: Header, tx: TransactionArgs, optimisticStateFetch = true
@@ -364,7 +364,7 @@ proc createAccessList*(
     else:
       al.add(adr)
 
-  var txWithAl = ensureMove(tx)
+  var txWithAl = tx
   txWithAl.accessList = Opt.some(al.getAccessList())
     # converts to transactions.AccessList
 
diff --git a/portal/network/beacon/beacon_init_loader.nim b/portal/network/beacon/beacon_init_loader.nim
index a4d9cd81fe..83db1c8b77 100644
--- a/portal/network/beacon/beacon_init_loader.nim
+++ b/portal/network/beacon/beacon_init_loader.nim
@@ -22,6 +22,9 @@ type NetworkInitData* = object
   forks*: ForkDigests
   genesis_validators_root*: Eth2Digest
 
+template loadNetworkMetaData*(networkName: string): Eth2NetworkMetadata =
+  loadEth2Network(some("mainnet"))
+
 proc loadNetworkData*(networkName: string): NetworkInitData =
   let
     metadata = loadEth2Network(some("mainnet"))
diff --git a/portal/tests/beacon_network_tests/test_beacon_content.nim b/portal/tests/beacon_network_tests/test_beacon_content.nim
index 162aa74153..473132f8a6 100644
--- a/portal/tests/beacon_network_tests/test_beacon_content.nim
+++ b/portal/tests/beacon_network_tests/test_beacon_content.nim
@@ -231,7 +231,7 @@ suite "Beacon Content Keys and Values":
         kind: LightClientDataFork.Altair, altairData: altairData
       )
       updateList = ForkedLightClientUpdateList.init(@[update, update])
-      cfg = loadNetworkData("mainnet").metadata.cfg
+      cfg = loadNetworkMetaData("mainnet").cfg
 
       encoded = encodeLightClientUpdatesForked(updateList, forkDigests, cfg)
       decoded = decodeLightClientUpdatesByRange(forkDigests, encoded)