diff --git a/.test_patterns.yml b/.test_patterns.yml
index f87a4b82fcd3..b06356005118 100644
--- a/.test_patterns.yml
+++ b/.test_patterns.yml
@@ -293,6 +293,11 @@ tests:
     error_regex: "ContractFunctionExecutionError: The contract function"
     owners:
       - *mitch
+  - regex: "e2e_p2p/inactivity_slash_with_consecutive_epochs.test.ts"
+    error_regex: "only slashes validator inactive for N consecutive epochs"
+    owners:
+      - *palla
+
   # Nightly GKE tests
   - regex: "spartan/bootstrap.sh"
     owners:
diff --git a/noir-projects/aztec-nr/aztec/src/macros/utils.nr b/noir-projects/aztec-nr/aztec/src/macros/utils.nr
index d4bf03172389..d98ba59eb8af 100644
--- a/noir-projects/aztec-nr/aztec/src/macros/utils.nr
+++ b/noir-projects/aztec-nr/aztec/src/macros/utils.nr
@@ -213,7 +213,7 @@ pub trait AsStrQuote {
     fn as_str_quote(self) -> (Self, u32);
 }
 
-impl<let N: u32, Env> AsStrQuote for Quoted {
+impl AsStrQuote for Quoted {
     // Used to convert an arbitrary quoted type into a quoted string, removing whitespace between tokens
     comptime fn as_str_quote(self) -> (Quoted, u32) {
         let tokens = self.tokens();
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/delayed_public_mutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/delayed_public_mutable.nr
index 41fba364c18f..011d84895bc1 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/delayed_public_mutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/delayed_public_mutable.nr
@@ -21,11 +21,11 @@ pub struct DelayedPublicMutable<T, let InitialDelay: u64, Context> {
     storage_slot: Field,
 }
 
-// This will make the Aztec macros require that T implements the Packable and Eq traits, and allocate `M` storage
+// This will make the Aztec macros require that T implements the Packable and Eq traits, and allocate `M + 1` storage
 // slots to this state variable.
-impl<T, let InitialDelay: u64, Context, let M: u32> HasStorageSlot<M> for DelayedPublicMutable<T, InitialDelay, Context>
+impl<T, let InitialDelay: u64, Context, let M: u32> HasStorageSlot<M + 1> for DelayedPublicMutable<T, InitialDelay, Context>
 where
-    WithHash<DelayedPublicMutableValues<T, InitialDelay>, _>: Packable<N = M>,
+    DelayedPublicMutableValues<T, InitialDelay>: Packable<N = M>,
 {
     fn get_storage_slot(self) -> Field {
         self.storage_slot
diff --git a/noir-projects/aztec-nr/aztec/src/state_vars/public_immutable.nr b/noir-projects/aztec-nr/aztec/src/state_vars/public_immutable.nr
index fb7667327ade..eb0adb7bdaaf 100644
--- a/noir-projects/aztec-nr/aztec/src/state_vars/public_immutable.nr
+++ b/noir-projects/aztec-nr/aztec/src/state_vars/public_immutable.nr
@@ -69,11 +69,11 @@ pub struct PublicImmutable<T, Context> {
 }
 // docs:end:public_immutable_struct
 
-/// `WithHash<T>` stores both the packed value (using O fields) and its hash (1 field), requiring O = M + 1 total
+/// `PublicImmutable` stores both the packed value (using M fields) and its hash (1 field), requiring M + 1 total
 /// fields.
-impl<T, Context, let M: u32, let O: u32> HasStorageSlot<O> for PublicImmutable<T, Context>
+impl<T, Context, let M: u32> HasStorageSlot<M + 1> for PublicImmutable<T, Context>
 where
-    WithHash<T, M>: Packable<N = O>,
+    T: Packable<N = M>,
 {
     fn get_storage_slot(self) -> Field {
         self.storage_slot