diff --git a/field/src/field_testing.rs b/field/src/field_testing.rs
index 171d0f12..a57d99fd 100644
--- a/field/src/field_testing.rs
+++ b/field/src/field_testing.rs
@@ -9,8 +9,7 @@ macro_rules! test_field_arithmetic {
         mod field_arithmetic {
             use num::bigint::BigUint;
             use rand::Rng;
-
-            use crate::field_types::Field;
+            use $crate::field_types::Field;
 
             #[test]
             fn batch_inversion() {
@@ -169,23 +168,23 @@ macro_rules! test_field_extension {
         mod field_extension {
             #[test]
             fn test_add_neg_sub_mul() {
-                crate::field_testing::test_add_neg_sub_mul::<$field, $d>();
+                $crate::field_testing::test_add_neg_sub_mul::<$field, $d>();
             }
             #[test]
             fn test_inv_div() {
-                crate::field_testing::test_inv_div::<$field, $d>();
+                $crate::field_testing::test_inv_div::<$field, $d>();
             }
             #[test]
             fn test_frobenius() {
-                crate::field_testing::test_frobenius::<$field, $d>();
+                $crate::field_testing::test_frobenius::<$field, $d>();
             }
             #[test]
             fn test_field_order() {
-                crate::field_testing::test_field_order::<$field, $d>();
+                $crate::field_testing::test_field_order::<$field, $d>();
             }
             #[test]
             fn test_power_of_two_gen() {
-                crate::field_testing::test_power_of_two_gen::<$field, $d>();
+                $crate::field_testing::test_power_of_two_gen::<$field, $d>();
             }
         }
     };
diff --git a/starky/src/recursive_verifier.rs b/starky/src/recursive_verifier.rs
index e646ee2d..e091d64c 100644
--- a/starky/src/recursive_verifier.rs
+++ b/starky/src/recursive_verifier.rs
@@ -11,6 +11,7 @@ use plonky2::iop::witness::Witness;
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::config::{AlgebraicHasher, GenericConfig};
 use plonky2::util::reducing::ReducingFactorTarget;
+use plonky2::with_context;
 
 use crate::config::StarkConfig;
 use crate::constraint_consumer::RecursiveConstraintConsumer;
@@ -40,7 +41,11 @@ pub fn recursively_verify_stark_proof<
 {
     assert_eq!(proof_with_pis.public_inputs.len(), S::PUBLIC_INPUTS);
     let degree_bits = proof_with_pis.proof.recover_degree_bits(inner_config);
-    let challenges = proof_with_pis.get_challenges::<F, C, S>(builder, &stark, inner_config);
+    let challenges = with_context!(
+        builder,
+        "compute challenges",
+        proof_with_pis.get_challenges::<F, C, S>(builder, &stark, inner_config)
+    );
 
     recursively_verify_stark_proof_with_challenges::<F, C, S, D>(
         builder,
@@ -94,6 +99,7 @@ fn recursively_verify_stark_proof_with_challenges<
             .try_into()
             .unwrap(),
     };
+
     let zeta_pow_deg = builder.exp_power_of_2_extension(challenges.stark_zeta, degree_bits);
     let z_h_zeta = builder.sub_extension(zeta_pow_deg, one);
     let (l_1, l_last) =
@@ -101,6 +107,7 @@ fn recursively_verify_stark_proof_with_challenges<
     let last =
         builder.constant_extension(F::Extension::primitive_root_of_unity(degree_bits).inverse());
     let z_last = builder.sub_extension(challenges.stark_zeta, last);
+
     let mut consumer = RecursiveConstraintConsumer::<F, D>::new(
         builder.zero_extension(),
         challenges.stark_alphas,
@@ -108,6 +115,7 @@ fn recursively_verify_stark_proof_with_challenges<
         l_1,
         l_last,
     );
+
     let permutation_data = stark
         .uses_permutation_args()
         .then(|| PermutationCheckDataTarget {
@@ -115,13 +123,18 @@ fn recursively_verify_stark_proof_with_challenges<
             next_zs: permutation_zs_right.as_ref().unwrap().clone(),
             permutation_challenge_sets: challenges.permutation_challenge_sets.unwrap(),
         });
-    eval_vanishing_poly_recursively::<F, C, S, D>(
+
+    with_context!(
         builder,
-        &stark,
-        inner_config,
-        vars,
-        permutation_data,
-        &mut consumer,
+        "evaluate vanishing polynomial",
+        eval_vanishing_poly_recursively::<F, C, S, D>(
+            builder,
+            &stark,
+            inner_config,
+            vars,
+            permutation_data,
+            &mut consumer,
+        )
     );
     let vanishing_polys_zeta = consumer.accumulators();