diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/append_only_tree_snapshot.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/append_only_tree_snapshot.nr
index e0f2485a92a..c6d8c57805b 100644
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/append_only_tree_snapshot.nr
+++ b/yarn-project/noir-protocol-circuits/src/crates/types/src/abis/append_only_tree_snapshot.nr
@@ -31,7 +31,7 @@ impl Empty for AppendOnlyTreeSnapshot {
     fn empty() -> Self {
         Self {
             root: 0,
-            next_available_leaf_index: 0
+            next_available_leaf_index: 0,
         }
     }
 }
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr
index 219fcf9769c..e041e959567 100644
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr
+++ b/yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr
@@ -110,8 +110,8 @@ global CONTRACT_STORAGE_READ_LENGTH: Field = 2;
 global PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 190;
 global GET_NOTES_ORACLE_RETURN_LENGTH: Field = 674;
 global CALL_PRIVATE_FUNCTION_RETURN_SIZE: Field = 195;
-global PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 87;
-global PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 177;
+global PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 98;
+global PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 188;
 global COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
 global NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
 global PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: Field = 1024;
diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr
index 7c5f916c66f..b4a621e421c 100644
--- a/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr
+++ b/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures.nr
@@ -22,22 +22,27 @@ global MSG_SENDER = AztecAddress { inner: 27 };
 
 global DEPLOYER_PUBLIC_KEY = GrumpkinPoint { x: 123456789, y: 123456789 };
 
+// Workaround for https://github.com/noir-lang/noir/issues/1440
+fn empty_append_only_tree() -> AppendOnlyTreeSnapshot {
+    AppendOnlyTreeSnapshot::empty()
+}
+
 global BLOCK_HEADER = Header {
-    last_archive: AppendOnlyTreeSnapshot::empty(),
+    last_archive: empty_append_only_tree(),
     body_hash: [0; NUM_FIELDS_PER_SHA256],
     state: StateReference {
-        l1_to_l2_message_tree: AppendOnlyTreeSnapshot::empty(),
+        l1_to_l2_message_tree: empty_append_only_tree(),
         partial: PartialStateReference {
             note_hash_tree: AppendOnlyTreeSnapshot {
                 root: fixtures::note_hash_tree::ROOT,
                 next_available_leaf_index: 0, // TODO: should this be populated?
             },
-            nullifier_tree: AppendOnlyTreeSnapshot::empty(),
+            nullifier_tree: empty_append_only_tree(),
             contract_tree: AppendOnlyTreeSnapshot {
                 root: fixtures::contract_tree::ROOT,
                 next_available_leaf_index: 0, // TODO: should this be populated?
             },
-            public_data_tree: AppendOnlyTreeSnapshot::empty()
+            public_data_tree: empty_append_only_tree()
         }
     },
     global_variables: GlobalVariables {