diff --git a/barretenberg/acir_tests/run_acir_tests.sh b/barretenberg/acir_tests/run_acir_tests.sh
index e75f8fb1a6b6..88189a434380 100755
--- a/barretenberg/acir_tests/run_acir_tests.sh
+++ b/barretenberg/acir_tests/run_acir_tests.sh
@@ -35,7 +35,7 @@ export BIN CRS_PATH VERBOSE BRANCH
 cd acir_tests
 
 # Convert them to array
-SKIP_ARRAY=(diamond_deps_0 workspace workspace_default_member witness_compression)
+SKIP_ARRAY=(diamond_deps_0 workspace workspace_default_member)
 
 function test() {
   cd $1
diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp
index 8ff5c5ba3381..3f57d848caae 100644
--- a/barretenberg/cpp/src/barretenberg/bb/main.cpp
+++ b/barretenberg/cpp/src/barretenberg/bb/main.cpp
@@ -601,8 +601,11 @@ void prove_honk(const std::string& bytecodePath, const std::string& witnessPath,
 
     auto builder = acir_format::create_circuit<Builder>(constraint_system, 0, witness);
 
-    const size_t additional_gates_buffer = 15; // conservatively large to be safe
+    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/6161): Make the total circuit size estimation more
+    // accurate for GoblinUltraHonk so that we can remove this magic buffer
+    const size_t additional_gates_buffer = 30; // conservatively large to be safe
     size_t srs_size = builder.get_circuit_subgroup_size(builder.get_total_circuit_size() + additional_gates_buffer);
+
     init_bn254_crs(srs_size);
 
     // Construct Honk proof
@@ -672,7 +675,9 @@ template <IsUltraFlavor Flavor> void write_vk_honk(const std::string& bytecodePa
     auto constraint_system = get_constraint_system(bytecodePath);
     auto builder = acir_format::create_circuit<Builder>(constraint_system, 0, {});
 
-    const size_t additional_gates_buffer = 15; // conservatively large to be safe
+    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/6161): Make the total circuit size estimation more
+    // accurate for GoblinUltraHonk so that we can remove this magic buffer
+    const size_t additional_gates_buffer = 30; // conservatively large to be safe
     size_t srs_size = builder.get_circuit_subgroup_size(builder.get_total_circuit_size() + additional_gates_buffer);
     init_bn254_crs(srs_size);
 
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
index 48b5c8e4ff3d..c30999fe761a 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
@@ -46,6 +46,7 @@ template <class Flavor> class ProverInstance_ {
         BB_OP_COUNT_TIME_NAME("ProverInstance(Circuit&)");
         circuit.add_gates_to_ensure_all_polys_are_non_zero();
         circuit.finalize_circuit();
+
         // If using a structured trace, ensure that no block exceeds the fixed size
         if (is_structured) {
             for (auto& block : circuit.blocks.get()) {
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
index 92166a00142e..7030f194cb40 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
@@ -77,6 +77,7 @@ template <IsUltraFlavor Flavor> HonkProof& UltraProver_<Flavor>::construct_proof
     OinkProver<Flavor> oink_prover(instance->proving_key, transcript);
     auto [proving_key, relation_params, alphas] = oink_prover.prove();
     instance->proving_key = std::move(proving_key);
+
     instance->relation_parameters = std::move(relation_params);
     instance->alphas = alphas;