diff --git a/nimbus_verified_proxy/tests/test_header_store.nim b/nimbus_verified_proxy/tests/test_header_store.nim
index a497375fc..fe8384750 100644
--- a/nimbus_verified_proxy/tests/test_header_store.nim
+++ b/nimbus_verified_proxy/tests/test_header_store.nim
@@ -12,8 +12,7 @@ import
   stint/endians2,
   eth/common/headers_rlp,
   ../header_store,
-  beacon_chain/spec/forks,
-  beacon_chain/spec/helpers
+  beacon_chain/spec/[forks, digest, helpers]
 
 func headerGenerator(number: int): ForkedLightClientHeader =
   ForkedLightClientHeader(
@@ -21,7 +20,8 @@ func headerGenerator(number: int): ForkedLightClientHeader =
     capellaData: capella.LightClientHeader(
       beacon: default(capella.BeaconBlockHeader),
       execution: capella.ExecutionPayloadHeader(
-        block_number: uint64(number), block_hash: Hash32(toBytesBE(u256(number)))
+        block_number: uint64(number),
+        block_hash: Eth2Digest(data: toBytesBE(u256(number))),
       ),
       execution_branch: default(capella.ExecutionBranch),
     ),
diff --git a/portal/tools/eth_data_exporter/cl_data_exporter.nim b/portal/tools/eth_data_exporter/cl_data_exporter.nim
index 4265639a4..977903d93 100644
--- a/portal/tools/eth_data_exporter/cl_data_exporter.nim
+++ b/portal/tools/eth_data_exporter/cl_data_exporter.nim
@@ -31,8 +31,6 @@ import
   ./exporter_common,
   ./downloader
 
-from beacon_chain/el/el_manager import toBeaconBlockHeader
-
 export beacon_clock
 
 const
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 8f43bd6b5..c51cf38cc 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 8f43bd6b5d8e4cbee940a9e630080e7801c3835c
+Subproject commit c51cf38cca6c07650776bb471f0537b2b3250cf5
diff --git a/vendor/nimbus-eth2 b/vendor/nimbus-eth2
index d6d2f006d..57dc8d1c0 160000
--- a/vendor/nimbus-eth2
+++ b/vendor/nimbus-eth2
@@ -1 +1 @@
-Subproject commit d6d2f006d507ab2e27b8477064feaad45ff99016
+Subproject commit 57dc8d1c0c2f81ff6e0da4c9a9f5b2117f795517