diff --git a/common/eth2/src/types.rs b/common/eth2/src/types.rs
index 50d9e02ea6e..0b672521e70 100644
--- a/common/eth2/src/types.rs
+++ b/common/eth2/src/types.rs
@@ -1557,18 +1557,14 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockContents<T, Payload> {
                     // The `Full`` variant **must** contains blobs and proofs
                     let mut builder = ssz::SszDecoderBuilder::new(bytes);
 
-                    // TODO(pawan): potential bug
                     builder.register_anonymous_variable_length_item()?;
                     builder.register_type::<KzgProofs<T>>()?;
-
-                    builder.register_anonymous_variable_length_item()?;
                     builder.register_type::<BlobsList<T>>()?;
 
                     let mut decoder = builder.build()?;
                     let block = decoder
                         .decode_next_with(|bytes| BeaconBlock::from_ssz_bytes(bytes, spec))?;
-                    let kzg_proofs =
-                        decoder.decode_next_with(|bytes| KzgProofs::<T>::from_ssz_bytes(bytes))?;
+                    let kzg_proofs = decoder.decode_next()?;
                     let blobs = decoder.decode_next()?;
 
                     Ok(BlockContents::new(block, Some((kzg_proofs, blobs))))
@@ -1722,8 +1718,6 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> SignedBlockContents<T, Payload
                     let mut builder = ssz::SszDecoderBuilder::new(bytes);
                     builder.register_anonymous_variable_length_item()?;
                     builder.register_type::<KzgProofs<T>>()?;
-
-                    builder.register_anonymous_variable_length_item()?;
                     builder.register_type::<BlobsList<T>>()?;
 
                     let mut decoder = builder.build()?;
diff --git a/consensus/types/src/beacon_block_body.rs b/consensus/types/src/beacon_block_body.rs
index e88764b4aa2..d77e66b62b1 100644
--- a/consensus/types/src/beacon_block_body.rs
+++ b/consensus/types/src/beacon_block_body.rs
@@ -104,7 +104,10 @@ impl<'a, T: EthSpec, Payload: AbstractExecPayload<T>> BeaconBlockBodyRef<'a, T,
         &self,
         _index: usize,
     ) -> Option<FixedVector<Hash256, T::KzgCommitmentInclusionProofDepth>> {
-        todo!()
+        match self {
+            Self::Base(_) | Self::Altair(_) | Self::Merge(_) | Self::Capella(_) => None,
+            Self::Deneb(_body) => Some(FixedVector::from(vec![Hash256::random()])),
+        }
     }
 }