diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1dde5b4e..d280b4b8 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -122,7 +122,7 @@ jobs:
       - avm
       - nox-snapshot
 
-    uses: fluencelabs/js-client/.github/workflows/tests.yml@master
+    uses: fluencelabs/js-client/.github/workflows/tests.yml@main
     with:
       avm-version: "${{ needs.avm.outputs.version }}"
       nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
@@ -131,7 +131,7 @@ jobs:
     needs:
       - avm
 
-    uses: fluencelabs/js-client/.github/workflows/snapshot.yml@master
+    uses: fluencelabs/js-client/.github/workflows/snapshot.yml@main
     with:
       avm-version: "${{ needs.avm.outputs.version }}"
 
diff --git a/avm/client/src/avmHelpers.ts b/avm/client/src/avmHelpers.ts
index e98725c8..e033df1f 100644
--- a/avm/client/src/avmHelpers.ts
+++ b/avm/client/src/avmHelpers.ts
@@ -26,7 +26,7 @@ const tetrapletRepr = new MsgPackRepr();
 // Have to match the air-interpreter-interface.
 const callResultsRepr = new MulticodecRepr(new MsgPackRepr());
 //
-const defaultAquaVMRuntimeMemoryLimit = Number("4294967296");
+const defaultAquaVMRuntimeMemoryLimit = 4294967296;
 
 /**
  * Encodes arguments into JSON array suitable for marine-js
@@ -66,7 +66,7 @@ export function serializeAvmArgs(
         air_size_limit: defaultAquaVMRuntimeMemoryLimit,
         particle_size_limit: defaultAquaVMRuntimeMemoryLimit,
         call_result_size_limit: defaultAquaVMRuntimeMemoryLimit,
-        hard_limit_enabled: defaultAquaVMRuntimeMemoryLimit,
+        hard_limit_enabled: false,
     };
 
     return [air, Array.from(prevData), Array.from(data), runParamsSnakeCase, Array.from(encodedCallResults)];