diff --git a/buildkite/scripts/build-js-tests.sh b/buildkite/scripts/build-js-tests.sh
index 880dffd6b1a..ef33ac983ff 100755
--- a/buildkite/scripts/build-js-tests.sh
+++ b/buildkite/scripts/build-js-tests.sh
@@ -8,9 +8,9 @@ make snarkyjs
 
 echo "Prepare SnarkyJS test module and pack into archive"
 npm pack src/lib/snarkyjs
-mv snarkyjs-*.tgz snarkyjs.tgz
+mv o1js-*.tgz o1js.tgz
 cd src/lib/snarkyjs/tests/integration
-npm i ../../../../../snarkyjs.tgz
+npm i ../../../../../o1js.tgz
 cp $(which node) ./node
 cd ../../../../..
 tar -chzf snarkyjs_test.tar.gz src/lib/snarkyjs/tests/integration
diff --git a/src/lib/consensus/proof_of_stake.ml b/src/lib/consensus/proof_of_stake.ml
index 696f0c028b7..8f636fa74b5 100644
--- a/src/lib/consensus/proof_of_stake.ml
+++ b/src/lib/consensus/proof_of_stake.ml
@@ -869,9 +869,9 @@ module Make_str (A : Wire_types.Concrete) = struct
             | _ ->
                 respond
                   (Provide
-                     (Snarky_backendless.Request.Handler.run handlers
-                        [ "Ledger Handler"; "Pending Coinbase Handler" ]
-                        request ) )
+                     (Option.value_exn ~message:"unhandled request"
+                        (Snarky_backendless.Request.Handler.run handlers request) )
+                  )
       end
 
       let check ~context:(module Context : CONTEXT)
@@ -2606,9 +2606,9 @@ module Make_str (A : Wire_types.Concrete) = struct
           | _ ->
               respond
                 (Provide
-                   (Snarky_backendless.Request.Handler.run handlers
-                      [ "Ledger Handler"; "Pending Coinbase Handler" ]
-                      request ) )
+                   (Option.value_exn ~message:"unhandled request"
+                      (Snarky_backendless.Request.Handler.run handlers request) )
+                )
 
       let ledger_depth { ledger; _ } = ledger.depth
     end
diff --git a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml
index ad7141591e2..61137e6088e 100644
--- a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml
+++ b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml
@@ -1188,8 +1188,8 @@ end = struct
   let reduce_lincom sys (x : Fp.t Snarky_backendless.Cvar.t) =
     let constant, terms =
       Fp.(
-        Snarky_backendless.Cvar.to_constant_and_terms ~add ~mul ~zero:(of_int 0)
-          ~equal ~one:(of_int 1))
+        Snarky_backendless.Cvar.to_constant_and_terms ~add ~mul ~zero ~equal
+          ~one)
         x
     in
     let terms = accumulate_terms terms in
diff --git a/src/lib/crypto/proof-systems b/src/lib/crypto/proof-systems
index fd7c19d4c5d..951cb6067b3 160000
--- a/src/lib/crypto/proof-systems
+++ b/src/lib/crypto/proof-systems
@@ -1 +1 @@
-Subproject commit fd7c19d4c5dbb6826d1d5ce6bc24796a44087f70
+Subproject commit 951cb6067b3f2aa375aed24f6dfdafaa39bc3c9c
diff --git a/src/lib/snarky b/src/lib/snarky
index 1671e9d8bbd..deda9f9362c 160000
--- a/src/lib/snarky
+++ b/src/lib/snarky
@@ -1 +1 @@
-Subproject commit 1671e9d8bbdf2e0a31bd7c3c045fb73dd11dd742
+Subproject commit deda9f9362c534aafac965e4eff92f187815e1b5
diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs
index 0bc79959ecb..aec52d7c0cb 160000
--- a/src/lib/snarkyjs
+++ b/src/lib/snarkyjs
@@ -1 +1 @@
-Subproject commit 0bc79959ecb54a49ffadee0f8c7143d4c52b4b9c
+Subproject commit aec52d7c0cbd2507e1a5044ba7bc354d65a55059