diff --git a/tfhe-csprng/src/generators/aes_ctr/generic.rs b/tfhe-csprng/src/generators/aes_ctr/generic.rs
index 58cc4bd82..1ad0db83e 100644
--- a/tfhe-csprng/src/generators/aes_ctr/generic.rs
+++ b/tfhe-csprng/src/generators/aes_ctr/generic.rs
@@ -592,7 +592,7 @@ pub mod aes_ctr_generic_test {
                 let expected_byte = gen1.next().unwrap();
                 assert_eq!(
                     byte, expected_byte,
-                    "pre-fork bytes are not equal (byte index {i}), key={k:?}, t={t:?}, offset={offset:?}"
+                    "pre-fork bytes are not equal (byte index {i}), key={k:?}, t={t:?}, offset={offset:?} nc={nc:?}, nb={nb:?}, num_extra_bytes={num_extra_bytes}, bytes_per_parts={bytes_per_parts}"
                 );
             }
 
@@ -604,7 +604,7 @@ pub mod aes_ctr_generic_test {
                     let expected_byte = gen1.next().unwrap();
                     assert_eq!(
                         byte, expected_byte,
-                        "invalid byte at index {i} for child {child_i}, key={k:?}, t={t:?}, offset={offset:?}"
+                        "invalid byte at index {i} for child {child_i}, key={k:?}, t={t:?}, offset={offset:?}offset={offset:?} nc={nc:?}, nb={nb:?}, num_extra_bytes={num_extra_bytes}, bytes_per_parts={bytes_per_parts}"
                     );
                 }
                 assert!(
@@ -621,7 +621,7 @@ pub mod aes_ctr_generic_test {
             for i in 0..bytes_per_parts {
                 let byte = forked_gen.next().unwrap();
                 let expected_byte = gen1.next().unwrap();
-                assert_eq!(byte, expected_byte, "post-fork bytes are not equal (byte index {i}), got {byte}, expected {expected_byte}, key={k:?}, t={t:?}, offset={offset:?}");
+                assert_eq!(byte, expected_byte, "post-fork bytes are not equal (byte index {i}), got {byte}, expected {expected_byte}, key={k:?}, t={t:?}, offset={offset:?}, offset={offset:?} nc={nc:?}, nb={nb:?}, num_extra_bytes={num_extra_bytes}, bytes_per_parts={bytes_per_parts}");
             }
         }
     }
diff --git a/tfhe-csprng/src/generators/aes_ctr/index.rs b/tfhe-csprng/src/generators/aes_ctr/index.rs
index 01663c662..ee9e7b6fc 100644
--- a/tfhe-csprng/src/generators/aes_ctr/index.rs
+++ b/tfhe-csprng/src/generators/aes_ctr/index.rs
@@ -584,7 +584,7 @@ mod test {
             );
         }
 
-        // Test when the distance correctly subracts from "saturated" value
+        // Test when the distance correctly subtracts from "saturated" value
         for byte_index in 1..BYTES_PER_AES_CALL {
             let larger = TableIndex::FIRST.increased(u128::MAX).increased(1);
             let smaller = TableIndex::FIRST.increased(byte_index as u128);