diff --git a/libcrux-ml-dsa/cg/code_gen.txt b/libcrux-ml-dsa/cg/code_gen.txt
index b0e4f99c7..fb5fd5691 100644
--- a/libcrux-ml-dsa/cg/code_gen.txt
+++ b/libcrux-ml-dsa/cg/code_gen.txt
@@ -3,4 +3,4 @@ Charon: a68994d00017b76a805d0115ca06c1f2c1805e79
 Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
 Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
 F*: b0961063393215ca65927f017720cb365a193833-dirty
-Libcrux: aecb2cd116d530465d34c6857e170fd6bab281b0
+Libcrux: c6c0198a72d0045f999b4b6a50ad7e917c8a9e42
diff --git a/libcrux-ml-dsa/cg/header.txt b/libcrux-ml-dsa/cg/header.txt
index bdd12b396..4cb8a526f 100644
--- a/libcrux-ml-dsa/cg/header.txt
+++ b/libcrux-ml-dsa/cg/header.txt
@@ -8,5 +8,5 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: aecb2cd116d530465d34c6857e170fd6bab281b0
+ * Libcrux: c6c0198a72d0045f999b4b6a50ad7e917c8a9e42
  */
diff --git a/libcrux-ml-dsa/cg/libcrux_core.h b/libcrux-ml-dsa/cg/libcrux_core.h
index 57c7db76c..09a487680 100644
--- a/libcrux-ml-dsa/cg/libcrux_core.h
+++ b/libcrux-ml-dsa/cg/libcrux_core.h
@@ -8,7 +8,7 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: aecb2cd116d530465d34c6857e170fd6bab281b0
+ * Libcrux: c6c0198a72d0045f999b4b6a50ad7e917c8a9e42
  */
 
 #ifndef __libcrux_core_H
diff --git a/libcrux-ml-dsa/cg/libcrux_mldsa65_avx2.h b/libcrux-ml-dsa/cg/libcrux_mldsa65_avx2.h
index 8a3d324dc..22fbd27b0 100644
--- a/libcrux-ml-dsa/cg/libcrux_mldsa65_avx2.h
+++ b/libcrux-ml-dsa/cg/libcrux_mldsa65_avx2.h
@@ -8,7 +8,7 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: aecb2cd116d530465d34c6857e170fd6bab281b0
+ * Libcrux: c6c0198a72d0045f999b4b6a50ad7e917c8a9e42
  */
 
 #ifndef __libcrux_mldsa65_avx2_H
@@ -8739,9 +8739,11 @@ static inline void libcrux_ml_dsa_encoding_t1_deserialize_ea(
                               __m256i);
        i++) {
     size_t i0 = i;
-    __m256i uu____0 = libcrux_ml_dsa_simd_avx2_t1_deserialize_a2(
-        Eurydice_slice_subslice2(serialized, i0 * (size_t)10U,
-                                 (i0 + (size_t)1U) * (size_t)10U, uint8_t));
+    __m256i uu____0 =
+        libcrux_ml_dsa_simd_avx2_t1_deserialize_a2(Eurydice_slice_subslice2(
+            serialized, i0 * LIBCRUX_ML_DSA_ENCODING_T1_DESERIALIZE_WINDOW,
+            (i0 + (size_t)1U) * LIBCRUX_ML_DSA_ENCODING_T1_DESERIALIZE_WINDOW,
+            uint8_t));
     result->simd_units[i0] = uu____0;
   }
 }
diff --git a/libcrux-ml-dsa/cg/libcrux_mldsa65_portable.h b/libcrux-ml-dsa/cg/libcrux_mldsa65_portable.h
index f05d7b3af..177e98ceb 100644
--- a/libcrux-ml-dsa/cg/libcrux_mldsa65_portable.h
+++ b/libcrux-ml-dsa/cg/libcrux_mldsa65_portable.h
@@ -8,7 +8,7 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: aecb2cd116d530465d34c6857e170fd6bab281b0
+ * Libcrux: c6c0198a72d0045f999b4b6a50ad7e917c8a9e42
  */
 
 #ifndef __libcrux_mldsa65_portable_H
@@ -71,6 +71,8 @@ extern "C" {
 
 #define LIBCRUX_ML_DSA_ENCODING_T0_OUTPUT_BYTES_PER_SIMD_UNIT ((size_t)13U)
 
+#define LIBCRUX_ML_DSA_ENCODING_T1_DESERIALIZE_WINDOW ((size_t)10U)
+
 #define LIBCRUX_ML_DSA_ENCODING_T1_SERIALIZE_OUTPUT_BYTES_PER_SIMD_UNIT \
   ((size_t)10U)
 
@@ -9687,9 +9689,10 @@ static inline void libcrux_ml_dsa_encoding_t1_deserialize_ba(
        i++) {
     size_t i0 = i;
     libcrux_ml_dsa_simd_portable_vector_type_PortableSIMDUnit uu____0 =
-        libcrux_ml_dsa_simd_portable_t1_deserialize_36(
-            Eurydice_slice_subslice2(serialized, i0 * (size_t)10U,
-                                     (i0 + (size_t)1U) * (size_t)10U, uint8_t));
+        libcrux_ml_dsa_simd_portable_t1_deserialize_36(Eurydice_slice_subslice2(
+            serialized, i0 * LIBCRUX_ML_DSA_ENCODING_T1_DESERIALIZE_WINDOW,
+            (i0 + (size_t)1U) * LIBCRUX_ML_DSA_ENCODING_T1_DESERIALIZE_WINDOW,
+            uint8_t));
     result->simd_units[i0] = uu____0;
   }
 }
diff --git a/libcrux-ml-dsa/cg/libcrux_sha3_avx2.h b/libcrux-ml-dsa/cg/libcrux_sha3_avx2.h
index b786152bb..a96bed3c2 100644
--- a/libcrux-ml-dsa/cg/libcrux_sha3_avx2.h
+++ b/libcrux-ml-dsa/cg/libcrux_sha3_avx2.h
@@ -8,7 +8,7 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: aecb2cd116d530465d34c6857e170fd6bab281b0
+ * Libcrux: c6c0198a72d0045f999b4b6a50ad7e917c8a9e42
  */
 
 #ifndef __libcrux_sha3_avx2_H
diff --git a/libcrux-ml-dsa/cg/libcrux_sha3_portable.h b/libcrux-ml-dsa/cg/libcrux_sha3_portable.h
index c12c02ac6..d798f2f87 100644
--- a/libcrux-ml-dsa/cg/libcrux_sha3_portable.h
+++ b/libcrux-ml-dsa/cg/libcrux_sha3_portable.h
@@ -8,7 +8,7 @@
  * Eurydice: b665364a6d86749566ce2d650d13fa12c8fab2c5
  * Karamel: 96572bc631fde691a2aea7bce5a5a3838b3a5968
  * F*: b0961063393215ca65927f017720cb365a193833-dirty
- * Libcrux: aecb2cd116d530465d34c6857e170fd6bab281b0
+ * Libcrux: c6c0198a72d0045f999b4b6a50ad7e917c8a9e42
  */
 
 #ifndef __libcrux_sha3_portable_H