diff --git a/beacon_node/network/src/beacon_processor/mod.rs b/beacon_node/network/src/beacon_processor/mod.rs
index b5d1c9ddbe..bc47480c04 100644
--- a/beacon_node/network/src/beacon_processor/mod.rs
+++ b/beacon_node/network/src/beacon_processor/mod.rs
@@ -121,7 +121,7 @@ const MAX_AGGREGATED_ATTESTATION_REPROCESS_QUEUE_LEN: usize = 1_024;
 /// before we start dropping them.
 const MAX_GOSSIP_BLOCK_QUEUE_LEN: usize = 1_024;
 
-/// The maximum number of queued `SignedBeaconBlockAndBlobsSidecar` objects received on gossip that
+/// The maximum number of queued `SignedBlobSidecar` objects received on gossip that
 /// will be stored before we start dropping them.
 const MAX_GOSSIP_BLOB_QUEUE_LEN: usize = 1_024;
 
@@ -164,7 +164,7 @@ const MAX_SYNC_CONTRIBUTION_QUEUE_LEN: usize = 1024;
 /// The maximum number of queued `SignedBeaconBlock` objects received from the network RPC that
 /// will be stored before we start dropping them.
 const MAX_RPC_BLOCK_QUEUE_LEN: usize = 1_024;
-const MAX_RPC_BLOB_QUEUE_LEN: usize = 1_024 * 4; // TODO(sean) make function of max blobs per block? or is this just too big?
+const MAX_RPC_BLOB_QUEUE_LEN: usize = 1_024 * 4;
 
 /// The maximum number of queued `Vec<SignedBeaconBlock>` objects received during syncing that will
 /// be stored before we start dropping them.
diff --git a/consensus/types/src/test_utils/test_random/bitfield.rs b/consensus/types/src/test_utils/test_random/bitfield.rs
index 871ae4342f..3992421e37 100644
--- a/consensus/types/src/test_utils/test_random/bitfield.rs
+++ b/consensus/types/src/test_utils/test_random/bitfield.rs
@@ -8,18 +8,15 @@ impl<N: Unsigned + Clone> TestRandom for BitList<N> {
         let mut raw_bytes = smallvec![0; initial_len];
         rng.fill_bytes(&mut raw_bytes);
 
-        let highest_set_bit = raw_bytes
+        let non_zero_bytes = raw_bytes
             .iter()
             .enumerate()
             .rev()
-            .find(|(_, byte)| **byte > 0)
-            .map(|(i, byte)| i * 8 + 7 - byte.leading_zeros() as usize)
+            .find_map(|(i, byte)| (*byte > 0).then_some(i + 1))
             .unwrap_or(0);
 
-        let actual_len = highest_set_bit / 8 + 1;
-
-        if actual_len < initial_len {
-            raw_bytes.truncate(actual_len);
+        if non_zero_bytes < initial_len {
+            raw_bytes.truncate(non_zero_bytes);
         }
 
         Self::from_bytes(raw_bytes).expect("we generate a valid BitList")