diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim
index 873613136..6a47e32ea 100644
--- a/beacon_chain/beacon_node.nim
+++ b/beacon_chain/beacon_node.nim
@@ -22,7 +22,7 @@ import
   spec/presets/custom,
   conf, time, beacon_chain_db, validator_pool, extras,
   attestation_pool, block_pool, eth2_network, eth2_discovery,
-  beacon_node_common, beacon_node_types,
+  beacon_node_common, beacon_node_types, sszdump,
   mainchain_monitor, version, ssz, ssz/dynamic_navigator,
   sync_protocol, request_manager, validator_keygen, interop, statusbar,
   sync_manager, state_transition,
@@ -291,6 +291,9 @@ proc storeBlock(node: BeaconNode, signedBlock: SignedBeaconBlock): bool =
     cat = "block_listener",
     pcs = "receive_block"
 
+  if node.config.dumpEnabled:
+    dump(node.config.dumpDir / "incoming", signedBlock, blockRoot)
+
   beacon_blocks_received.inc()
   if node.blockPool.add(blockRoot, signedBlock).isNil:
     return false
@@ -479,35 +482,6 @@ proc onSecond(node: BeaconNode, moment: Moment) {.async.} =
   discard setTimer(nextSecond) do (p: pointer):
     asyncCheck node.onSecond(nextSecond)
 
-proc getHeadSlot*(peer: Peer): Slot {.inline.} =
-  ## Returns head slot for specific peer ``peer``.
-  result = peer.state(BeaconSync).statusMsg.headSlot
-
-proc updateStatus*(peer: Peer): Future[bool] {.async.} =
-  ## Request `status` of remote peer ``peer``.
-  let
-    nstate = peer.networkState(BeaconSync)
-    finalizedHead = nstate.blockPool.finalizedHead
-    headBlock = nstate.blockPool.head.blck
-
-    ourStatus = StatusMsg(
-      forkDigest: nstate.forkDigest,
-      finalizedRoot: finalizedHead.blck.root,
-      finalizedEpoch: finalizedHead.slot.compute_epoch_at_slot(),
-      headRoot: headBlock.root,
-      headSlot: headBlock.slot
-    )
-
-  let theirFut = awaitne peer.status(ourStatus,
-                                     timeout = chronos.seconds(60))
-  if theirFut.failed():
-    result = false
-  else:
-    let theirStatus = theirFut.read()
-    if theirStatus.isSome():
-      peer.state(BeaconSync).statusMsg = theirStatus.get()
-      result = true
-
 proc runSyncLoop(node: BeaconNode) {.async.} =
   proc getLocalHeadSlot(): Slot =
     result = node.blockPool.head.blck.slot
@@ -544,7 +518,7 @@ proc runSyncLoop(node: BeaconNode) {.async.} =
     node.network.peerPool, getLocalHeadSlot, getLocalWallSlot,
     updateLocalBlocks,
     # TODO increase when block processing perf improves
-    chunkSize = 8
+    chunkSize = 16
   )
 
   await syncman.sync()
diff --git a/beacon_chain/inspector.nim b/beacon_chain/inspector.nim
index e637f7950..79b7a96ba 100644
--- a/beacon_chain/inspector.nim
+++ b/beacon_chain/inspector.nim
@@ -268,7 +268,7 @@ proc tryGetForkDigest(hexdigest: string): Option[ForkDigest] =
   var res: ForkDigest
   if len(hexdigest) > 0:
     try:
-      hexToByteArray(hexdigest, res)
+      hexToByteArray(hexdigest, array[4 ,byte](res))
       result = some(res)
     except CatchableError:
       discard
@@ -441,8 +441,8 @@ proc logEnrAddress(address: string) =
       if eth2Data.isSome():
         try:
           var forkid = SSZ.decode(eth2Data.get(), ENRForkID)
-          eth2fork_digest = bu.toHex(forkid.fork_digest)
-          eth2next_fork_version = bu.toHex(forkid.next_fork_version)
+          eth2fork_digest = $forkid.fork_digest
+          eth2next_fork_version = $forkid.next_fork_version
           eth2next_fork_epoch = strutils.toHex(cast[uint64](forkid.next_fork_epoch))
         except CatchableError:
           eth2fork_digest = "Error"
@@ -634,8 +634,8 @@ proc run(conf: InspectorConf) {.async.} =
           if forkDigest.get() != forkOpt.get():
             warn "Bootstrap node address has different forkDigest",
                  address = item.addressRec.toUri(),
-                 address_fork_digest = bu.toHex(forkOpt.get()),
-                 stored_fork_digest = bu.toHex(forkDigest.get())
+                 address_fork_digest = $(forkOpt.get()),
+                 stored_fork_digest = $(forkDigest.get())
         else:
           forkDigest = forkOpt
 
@@ -673,8 +673,8 @@ proc run(conf: InspectorConf) {.async.} =
     if argForkDigest.isSome():
       if forkDigest.isSome() != argForkDigest.isSome():
         warn "forkDigest argument value is different, using argument value",
-             argument_fork_digest = toHex(argForkDigest.get()),
-             bootstrap_fork_digest = toHex(forkDigest.get())
+             argument_fork_digest = argForkDigest.get(),
+             bootstrap_fork_digest = forkDigest.get()
         forkDigest = argForkDigest
 
   let seckey = lcrypto.PrivateKey.random(PKScheme.Secp256k1)
diff --git a/beacon_chain/interop.nim b/beacon_chain/interop.nim
index 6aed238d9..cd67ea5f1 100644
--- a/beacon_chain/interop.nim
+++ b/beacon_chain/interop.nim
@@ -53,7 +53,7 @@ func makeDeposit*(
         withdrawal_credentials: makeWithdrawalCredentials(pubkey)))
 
   if skipBLSValidation notin flags:
-    let domain = compute_domain(DOMAIN_DEPOSIT, GENESIS_FORK_VERSION)
+    let domain = compute_domain(DOMAIN_DEPOSIT)
     let signing_root = compute_signing_root(ret.getDepositMessage, domain)
 
     ret.data.signature = bls_sign(privkey, signing_root.data)
diff --git a/beacon_chain/spec/beaconstate.nim b/beacon_chain/spec/beaconstate.nim
index 6889baae4..cd34db0c5 100644
--- a/beacon_chain/spec/beaconstate.nim
+++ b/beacon_chain/spec/beaconstate.nim
@@ -62,6 +62,9 @@ proc process_deposit*(
     state.eth1_deposit_index,
     state.eth1_data.deposit_root,
   ):
+    notice "Deposit merkle validation failed",
+      proof = deposit.proof, deposit_root = state.eth1_data.deposit_root,
+      deposit_index = state.eth1_deposit_index
     return false
 
   # Deposits must be processed in order
@@ -78,18 +81,17 @@ proc process_deposit*(
     # by the deposit contract
 
     # Fork-agnostic domain since deposits are valid across forks
-    #
-    # TODO zcli/zrnt does use the GENESIS_FORK_VERSION which can
-    # vary between minimal/mainnet, though, despite the comment,
-    # which is copied verbatim from the eth2 beacon chain spec.
-    # https://github.com/protolambda/zrnt/blob/v0.11.0/eth2/phase0/kickstart.go#L58
-    let domain = compute_domain(DOMAIN_DEPOSIT, GENESIS_FORK_VERSION)
+    let domain = compute_domain(DOMAIN_DEPOSIT)
 
     let signing_root = compute_signing_root(deposit.getDepositMessage, domain)
     if skipBLSValidation notin flags and not bls_verify(
         pubkey, signing_root.data,
         deposit.data.signature):
-      return false
+      # It's ok that deposits fail - they get included in blocks regardless
+      # TODO spec test?
+      debug "Skipping deposit with invalid signature",
+        pubkey, signing_root, signature = deposit.data.signature
+      return true
 
     # Add validator and balance entries
     state.validators.add(Validator(
@@ -220,8 +222,8 @@ proc initialize_beacon_state_from_eth1*(
   const SECONDS_PER_DAY = uint64(60*60*24)
   var state = BeaconStateRef(
     fork: Fork(
-      previous_version: GENESIS_FORK_VERSION,
-      current_version: GENESIS_FORK_VERSION,
+      previous_version: Version(GENESIS_FORK_VERSION),
+      current_version: Version(GENESIS_FORK_VERSION),
       epoch: GENESIS_EPOCH),
     genesis_time:
       eth1_timestamp + 2'u64 * SECONDS_PER_DAY -
diff --git a/beacon_chain/spec/datatypes.nim b/beacon_chain/spec/datatypes.nim
index 50bd9da50..6c58d6d9e 100644
--- a/beacon_chain/spec/datatypes.nim
+++ b/beacon_chain/spec/datatypes.nim
@@ -152,8 +152,8 @@ type
     data*: AttestationData
     signature*: ValidatorSig
 
-  Version* = array[4, byte] # TODO Maybe make this distinct
-  ForkDigest* = array[4, byte] # TODO Maybe make this distinct
+  Version* = distinct array[4, byte]
+  ForkDigest* = distinct array[4, byte]
 
   # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/beacon-chain.md#forkdata
   ForkData* = object
@@ -501,6 +501,17 @@ proc writeValue*(writer: var JsonWriter, value: ValidatorIndex) =
 proc readValue*(reader: var JsonReader, value: var ValidatorIndex) =
   value = ValidatorIndex reader.readValue(uint32)
 
+proc writeValue*(writer: var JsonWriter, value: Version | ForkDigest) =
+  writeValue(writer, $value)
+
+proc readValue*(reader: var JsonReader, value: var Version) =
+  let hex = reader.readValue(string)
+  hexToByteArray(hex, array[4, byte](value))
+
+proc readValue*(reader: var JsonReader, value: var ForkDigest) =
+  let hex = reader.readValue(string)
+  hexToByteArray(hex, array[4, byte](value))
+
 # `ValidatorIndex` seq handling.
 proc max*(a: ValidatorIndex, b: int) : auto =
   max(a.int, b)
@@ -580,6 +591,17 @@ when useListType:
 else:
   template asSeq*[T; N](x: List[T, N]): auto = x
 
+func `$`*(v: ForkDigest | Version): string =
+  toHex(array[4, byte](v))
+
+# TODO where's borrow support when you need it
+func `==`*(a, b: ForkDigest | Version): bool =
+  array[4, byte](a) == array[4, byte](b)
+func len*(v: ForkDigest | Version): int = sizeof(v)
+func low*(v: ForkDigest | Version): int = 0
+func high*(v: ForkDigest | Version): int = len(v) - 1
+func `[]`*(v: ForkDigest | Version, idx: int): byte = array[4, byte](v)[idx]
+
 func shortLog*(s: Slot): uint64 =
   s - GENESIS_SLOT
 
diff --git a/beacon_chain/spec/helpers.nim b/beacon_chain/spec/helpers.nim
index e91ac584c..010efbfc6 100644
--- a/beacon_chain/spec/helpers.nim
+++ b/beacon_chain/spec/helpers.nim
@@ -125,7 +125,7 @@ func int_to_bytes4*(x: uint64): array[4, byte] =
   result[3] = ((x shr 24) and 0xff).byte
 
 # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/beacon-chain.md#compute_fork_data_root
-func compute_fork_data_root(current_version: array[4, byte],
+func compute_fork_data_root(current_version: Version,
     genesis_validators_root: Eth2Digest): Eth2Digest =
   # Return the 32-byte fork data root for the ``current_version`` and
   # ``genesis_validators_root``.
@@ -137,19 +137,20 @@ func compute_fork_data_root(current_version: array[4, byte],
   ))
 
 # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/beacon-chain.md#compute_fork_digest
-func compute_fork_digest*(current_version: array[4, byte],
-                          genesis_validators_root: Eth2Digest): array[4, byte] =
+func compute_fork_digest*(current_version: Version,
+                          genesis_validators_root: Eth2Digest): ForkDigest =
   # Return the 4-byte fork digest for the ``current_version`` and
   # ``genesis_validators_root``.
   # This is a digest primarily used for domain separation on the p2p layer.
   # 4-bytes suffices for practical separation of forks/chains.
-  result[0..3] =
-    compute_fork_data_root(current_version, genesis_validators_root).data[0..3]
+  array[4, byte](result)[0..3] =
+    compute_fork_data_root(
+      current_version, genesis_validators_root).data.toOpenArray(0, 3)
 
 # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/beacon-chain.md#compute_domain
 func compute_domain*(
     domain_type: DomainType,
-    fork_version: array[4, byte] = [0'u8, 0, 0, 0],
+    fork_version: Version = Version(GENESIS_FORK_VERSION),
     genesis_validators_root: Eth2Digest = ZERO_HASH): Domain =
   # Return the domain for the ``domain_type`` and ``fork_version``.
   let fork_data_root =
diff --git a/beacon_chain/spec/network.nim b/beacon_chain/spec/network.nim
index e6e0b8ee3..54cecb990 100644
--- a/beacon_chain/spec/network.nim
+++ b/beacon_chain/spec/network.nim
@@ -9,7 +9,6 @@
 
 import
   strformat,
-  stew/byteutils,
   datatypes
 
 const
@@ -30,31 +29,31 @@ const
 
 func getBeaconBlocksTopic*(forkDigest: ForkDigest): string =
   try:
-    &"/eth2/{toHex forkDigest}/{topicBeaconBlocksSuffix}"
+    &"/eth2/{$forkDigest}/{topicBeaconBlocksSuffix}"
   except ValueError as e:
     raiseAssert e.msg
 
 func getVoluntaryExitsTopic*(forkDigest: ForkDigest): string =
   try:
-    &"/eth2/{toHex forkDigest}/{topicVoluntaryExitsSuffix}"
+    &"/eth2/{$forkDigest}/{topicVoluntaryExitsSuffix}"
   except ValueError as e:
     raiseAssert e.msg
 
 func getProposerSlashingsTopic*(forkDigest: ForkDigest): string =
   try:
-    &"/eth2/{toHex forkDigest}/{topicProposerSlashingsSuffix}"
+    &"/eth2/{$forkDigest}/{topicProposerSlashingsSuffix}"
   except ValueError as e:
     raiseAssert e.msg
 
 func getAttesterSlashingsTopic*(forkDigest: ForkDigest): string =
   try:
-    &"/eth2/{toHex forkDigest}/{topicAttesterSlashingsSuffix}"
+    &"/eth2/{$forkDigest}/{topicAttesterSlashingsSuffix}"
   except ValueError as e:
     raiseAssert e.msg
 
 func getAggregateAndProofsTopic*(forkDigest: ForkDigest): string =
   try:
-    &"/eth2/{toHex forkDigest}/{topicAggregateAndProofsSuffix}"
+    &"/eth2/{$forkDigest}/{topicAggregateAndProofsSuffix}"
   except ValueError as e:
     raiseAssert e.msg
 
@@ -62,6 +61,6 @@ func getAttestationTopic*(forkDigest: ForkDigest, committeeIndex: uint64): strin
   # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/validator.md#broadcast-attestation
   try:
     let topicIndex = committeeIndex mod ATTESTATION_SUBNET_COUNT
-    &"/eth2/{toHex forkDigest}/committee_index{topicIndex}{topicAttestationsSuffix}"
+    &"/eth2/{$forkDigest}/committee_index{topicIndex}{topicAttestationsSuffix}"
   except ValueError as e:
     raiseAssert e.msg
diff --git a/beacon_chain/ssz.nim b/beacon_chain/ssz.nim
index 7bcc8d124..def7ce9a6 100644
--- a/beacon_chain/ssz.nim
+++ b/beacon_chain/ssz.nim
@@ -13,7 +13,7 @@
 #{.push raises: [Defect].}
 
 import
-  stew/shims/macros, options, algorithm, options,
+  stew/shims/macros, options, algorithm, options, strformat,
   stew/[bitops2, bitseqs, endians2, objects, varints, ptrops, ranges/ptr_arith], stint,
   faststreams/input_stream, serialization, serialization/testing/tracing,
   ./spec/[crypto, datatypes, digest],
@@ -86,7 +86,10 @@ proc mount*(F: type SSZ, stream: InputStream, T: type): T {.raises: [Defect].} =
 
 method formatMsg*(err: ref SszSizeMismatchError, filename: string): string {.gcsafe, raises: [Defect].} =
   # TODO: implement proper error string
-  "Serialisation error while processing " & filename
+  try:
+    &"SSZ size mismatch, element {err.elementSize}, actual {err.actualSszSize}, type {err.deserializedType}, file {filename}"
+  except CatchableError:
+    "SSZ size mismatch"
 
 when false:
   # TODO: Nim can't handle yet this simpler definition. File an issue.
@@ -110,6 +113,7 @@ template toSszType*(x: auto): auto =
   elif x is BlsCurveType: toRaw(x)
   elif x is BitSeq|BitList: ByteList(x)
   elif x is TypeWithMaxLen: toSszType valueOf(x)
+  elif x is ForkDigest|Version: array[4, byte](x)
   elif useListType and x is List: seq[x.T](x)
   else: x
 
diff --git a/beacon_chain/ssz/bytes_reader.nim b/beacon_chain/ssz/bytes_reader.nim
index 755f9cb73..b2d90213e 100644
--- a/beacon_chain/ssz/bytes_reader.nim
+++ b/beacon_chain/ssz/bytes_reader.nim
@@ -51,6 +51,16 @@ template fromSszBytes*(T: type Slot, bytes: openarray[byte]): Slot =
 template fromSszBytes*(T: type Epoch, bytes: openarray[byte]): Epoch =
   Epoch fromSszBytes(uint64, bytes)
 
+func fromSszBytes*(T: type ForkDigest, bytes: openarray[byte]): T {.raisesssz.} =
+  if bytes.len < sizeof(result):
+    raise newException(MalformedSszError, "SSZ input of insufficient size")
+  copyMem(result.addr, unsafeAddr bytes[0], sizeof(result))
+
+func fromSszBytes*(T: type Version, bytes: openarray[byte]): T {.raisesssz.} =
+  if bytes.len < sizeof(result):
+    raise newException(MalformedSszError, "SSZ input of insufficient size")
+  copyMem(result.addr, unsafeAddr bytes[0], sizeof(result))
+
 template fromSszBytes*(T: type enum, bytes: openarray[byte]): auto  =
   T fromSszBytes(uint64, bytes)
 
diff --git a/beacon_chain/sszdump.nim b/beacon_chain/sszdump.nim
index 449ce021e..19557f055 100644
--- a/beacon_chain/sszdump.nim
+++ b/beacon_chain/sszdump.nim
@@ -8,10 +8,14 @@ import
 proc dump*(dir: string, v: AttestationData, validator: ValidatorPubKey) =
   SSZ.saveFile(dir / &"att-{v.slot}-{v.index}-{shortLog(validator)}.ssz", v)
 
+proc dump*(dir: string, v: SignedBeaconBlock, root: Eth2Digest) =
+  SSZ.saveFile(dir / &"block-{v.message.slot}-{shortLog(root)}.ssz", v)
+
 proc dump*(dir: string, v: SignedBeaconBlock, blck: BlockRef) =
-  SSZ.saveFile(dir / &"block-{v.message.slot}-{shortLog(blck.root)}.ssz", v)
+  dump(dir, v, blck.root)
 
 proc dump*(dir: string, v: HashedBeaconState, blck: BlockRef) =
   SSZ.saveFile(
     dir / &"state-{v.data.slot}-{shortLog(blck.root)}-{shortLog(v.root)}.ssz",
     v.data)
+
diff --git a/beacon_chain/sync_manager.nim b/beacon_chain/sync_manager.nim
index 6079e56c0..cf4d26ee2 100644
--- a/beacon_chain/sync_manager.nim
+++ b/beacon_chain/sync_manager.nim
@@ -437,6 +437,12 @@ proc sync*[A, B](man: SyncManager[A, B]) {.async.} =
                     wall_head_slot = wallSlot, local_head_slot = headSlot,
                     peer_score = peer.getScore(), topics = "syncman"
               man.pool.release(peer)
+            elif not peer.hasInitialStatus:
+              # TODO Don't even consider these peers!
+              debug "Peer not ready", peer
+              man.pool.release(peer)
+              # TODO goes into tight loop without this
+              await sleepAsync(RESP_TIMEOUT)
             else:
               if headSlot > man.queue.lastSlot:
                 man.queue = SyncQueue.init(headSlot, wallSlot, man.chunkSize,
diff --git a/beacon_chain/sync_protocol.nim b/beacon_chain/sync_protocol.nim
index f297e79af..c24692856 100644
--- a/beacon_chain/sync_protocol.nim
+++ b/beacon_chain/sync_protocol.nim
@@ -47,33 +47,41 @@ const
     # request - typically clients will ask for an epoch or so at a time, but we
     # allow a little bit more in case they want to stream blocks faster
 
+proc shortLog*(s: StatusMsg): auto =
+  (
+    forkDigest: s.forkDigest,
+    finalizedRoot: shortLog(s.finalizedRoot),
+    finalizedEpoch: shortLog(s.finalizedEpoch),
+    headRoot: shortLog(s.headRoot),
+    headSlot: shortLog(s.headSlot)
+  )
+chronicles.formatIt(StatusMsg): shortLog(it)
+
 proc importBlocks(state: BeaconSyncNetworkState,
                   blocks: openarray[SignedBeaconBlock]) {.gcsafe.} =
   for blk in blocks:
     state.onBeaconBlock(blk)
   info "Forward sync imported blocks", len = blocks.len
 
-proc getCurrentStatus(state: BeaconSyncNetworkState): StatusMsg {.gcsafe.} =
+proc getCurrentStatus*(state: BeaconSyncNetworkState): StatusMsg {.gcsafe.} =
   let
     blockPool = state.blockPool
-    finalizedHead = blockPool.finalizedHead
     headBlock = blockPool.head.blck
-    headRoot = headBlock.root
-    headSlot = headBlock.slot
-    finalizedEpoch = finalizedHead.slot.compute_epoch_at_slot()
 
   StatusMsg(
     forkDigest: state.forkDigest,
-    finalizedRoot: finalizedHead.blck.root,
-    finalizedEpoch: finalizedEpoch,
-    headRoot: headRoot,
-    headSlot: headSlot)
+    finalizedRoot: blockPool.headState.data.data.finalized_checkpoint.root,
+    finalizedEpoch: blockPool.headState.data.data.finalized_checkpoint.epoch,
+    headRoot: headBlock.root,
+    headSlot: headBlock.slot)
 
 proc handleInitialStatus(peer: Peer,
                          state: BeaconSyncNetworkState,
                          ourStatus: StatusMsg,
                          theirStatus: StatusMsg): Future[bool] {.async, gcsafe.}
 
+proc setStatusMsg(peer: Peer, statusMsg: StatusMsg) {.gcsafe.}
+
 p2pProtocol BeaconSync(version = 1,
                        rlpxName = "bcs",
                        networkState = BeaconSyncNetworkState,
@@ -92,7 +100,7 @@ p2pProtocol BeaconSync(version = 1,
         let res = await peer.handleInitialStatus(peer.networkState,
                                                  ourStatus, tstatus)
         if res:
-          peer.state(BeaconSync).statusMsg = tstatus
+          peer.setStatusMsg(tstatus)
       else:
         warn "Status response not received in time"
 
@@ -101,16 +109,14 @@ p2pProtocol BeaconSync(version = 1,
       let
         ourStatus = peer.networkState.getCurrentStatus()
 
+      if not await peer.handleInitialStatus(
+          peer.networkState, ourStatus, theirStatus):
+        return
+      peer.setStatusMsg(theirStatus)
+
       trace "Sending status msg", ourStatus
       await response.send(ourStatus)
 
-      if not peer.state.initialStatusReceived:
-        peer.state.initialStatusReceived = true
-        let res = await peer.handleInitialStatus(peer.networkState,
-                                                 ourStatus, theirStatus)
-        if res:
-          peer.state(BeaconSync).statusMsg = theirStatus
-
     proc statusResp(peer: Peer, msg: StatusMsg)
 
   proc goodbye(peer: Peer, reason: DisconnectionReason) {.libp2pProtocol("goodbye", 1).}
@@ -179,19 +185,44 @@ p2pProtocol BeaconSync(version = 1,
             peer: Peer,
             blocks: openarray[SignedBeaconBlock])
 
+proc setStatusMsg(peer: Peer, statusMsg: StatusMsg) =
+  debug "Peer status", peer, statusMsg
+  peer.state(BeaconSync).initialStatusReceived = true
+  peer.state(BeaconSync).statusMsg = statusMsg
+
+proc updateStatus*(peer: Peer): Future[bool] {.async.} =
+  ## Request `status` of remote peer ``peer``.
+  let
+    nstate = peer.networkState(BeaconSync)
+    ourStatus = getCurrentStatus(nstate)
+
+  let theirFut = awaitne peer.status(ourStatus,
+                                     timeout = chronos.seconds(60))
+  if theirFut.failed():
+    result = false
+  else:
+    let theirStatus = theirFut.read()
+    if theirStatus.isSome():
+      peer.setStatusMsg(theirStatus.get())
+      result = true
+
+proc hasInitialStatus*(peer: Peer): bool {.inline.} =
+  ## Returns head slot for specific peer ``peer``.
+  peer.state(BeaconSync).initialStatusReceived
+
+proc getHeadSlot*(peer: Peer): Slot {.inline.} =
+  ## Returns head slot for specific peer ``peer``.
+  result = peer.state(BeaconSync).statusMsg.headSlot
+
 proc handleInitialStatus(peer: Peer,
                          state: BeaconSyncNetworkState,
                          ourStatus: StatusMsg,
-                       theirStatus: StatusMsg): Future[bool] {.async, gcsafe.} =
+                         theirStatus: StatusMsg): Future[bool] {.async, gcsafe.} =
   if theirStatus.forkDigest != state.forkDigest:
-    notice "Irrelevant peer",
-      peer, theirFork = theirStatus.forkDigest, ourFork = state.forkDigest
+    notice "Irrelevant peer", peer, theirStatus, ourStatus
     await peer.disconnect(IrrelevantNetwork)
     return false
-  debug "Peer connected", peer,
-                          localHeadSlot = ourStatus.headSlot,
-                          remoteHeadSlot = theirStatus.headSlot,
-                          remoteHeadRoot = theirStatus.headRoot
+  debug "Peer connected", peer, theirStatus, ourStatus
   return true
 
 proc initBeaconSync*(network: Eth2Node,
diff --git a/scripts/connect_to_testnet.nims b/scripts/connect_to_testnet.nims
index 807714fce..f621c5460 100644
--- a/scripts/connect_to_testnet.nims
+++ b/scripts/connect_to_testnet.nims
@@ -116,6 +116,7 @@ cli do (skipGoerliKey {.
   exec &"""nim c {nimFlags} -d:"const_preset={preset}" -o:"{beaconNodeBinary}" beacon_chain/beacon_node.nim"""
 
   mkDir dumpDir
+  mkDir dumpDir / "incoming"
 
   proc execIgnoringExitCode(s: string) =
     # reduces the error output when interrupting an external command with Ctrl+C
diff --git a/tests/mocking/mock_deposits.nim b/tests/mocking/mock_deposits.nim
index 3e3beb803..1ab69abb9 100644
--- a/tests/mocking/mock_deposits.nim
+++ b/tests/mocking/mock_deposits.nim
@@ -25,7 +25,7 @@ func signMockDepositData(
   # No state --> Genesis
   let domain = compute_domain(
       DOMAIN_DEPOSIT,
-      default(array[4, byte]) # Genesis is fork_version 0
+      Version(GENESIS_FORK_VERSION)
     )
   let signing_root = compute_signing_root(
     deposit_data.getDepositMessage(),
@@ -43,7 +43,7 @@ func signMockDepositData(
       ) =
   let domain = compute_domain(
       DOMAIN_DEPOSIT,
-      default(array[4, byte]) # Genesis is fork_version 0
+      Version(GENESIS_FORK_VERSION)
     )
   let signing_root = compute_signing_root(
     deposit_data.getDepositMessage(),
diff --git a/tests/testblockutil.nim b/tests/testblockutil.nim
index 26e8e3822..217ffad75 100644
--- a/tests/testblockutil.nim
+++ b/tests/testblockutil.nim
@@ -43,7 +43,7 @@ func makeDeposit(i: int, flags: UpdateFlags): Deposit =
     privkey = makeFakeValidatorPrivKey(i)
     pubkey = privkey.toPubKey()
     withdrawal_credentials = makeFakeHash(i)
-    domain = compute_domain(DOMAIN_DEPOSIT, GENESIS_FORK_VERSION)
+    domain = compute_domain(DOMAIN_DEPOSIT, Version(GENESIS_FORK_VERSION))
 
   result = Deposit(
     data: DepositData(
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 87e1f3c61..c990b5d9b 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 87e1f3c61fe65f28be6e5383df81111c58b9fd76
+Subproject commit c990b5d9bd0c082741de1bdc156780f9dce32647