diff --git a/beacon_chain/libp2p_backend.nim b/beacon_chain/libp2p_backend.nim
index f6c17d74f..1336eac35 100644
--- a/beacon_chain/libp2p_backend.nim
+++ b/beacon_chain/libp2p_backend.nim
@@ -184,8 +184,8 @@ proc toPeerInfo(r: Option[enr.TypedRecord]): PeerInfo =
 proc dialPeer*(node: Eth2Node, peerInfo: PeerInfo) {.async.} =
   logScope: peer = $peerInfo
 
-  debug "Dialing peer"
-  discard await node.switch.dial(peerInfo)
+  debug "Connecting to peer"
+  await node.switch.connect(peerInfo)
   var peer = node.getPeer(peerInfo)
   peer.wasDialed = true
 
diff --git a/config.nims b/config.nims
index b59c164c5..cd9029f21 100644
--- a/config.nims
+++ b/config.nims
@@ -37,6 +37,7 @@ else:
 --excessiveStackTrace:on
 # enable metric collection
 --define:metrics
+--define:chronicles_line_numbers
 
 # the default open files limit is too low on macOS (512), breaking the
 # "--debugger:native" build. It can be increased with `ulimit -n 1024`.
diff --git a/scripts/launch_local_testnet.sh b/scripts/launch_local_testnet.sh
index faef2a54a..6620f1f36 100755
--- a/scripts/launch_local_testnet.sh
+++ b/scripts/launch_local_testnet.sh
@@ -88,6 +88,11 @@ while true; do
 	esac
 done
 
+# when sourcing env.sh, it will try to execute $@, so empty it
+EXTRA_ARGS="$@"
+if [[ $# != 0 ]]; then
+	shift $#
+fi
 NETWORK="testnet${TESTNET}"
 
 rm -rf "${DATA_DIR}"
@@ -173,7 +178,7 @@ for NUM_NODE in $(seq 0 $(( ${NUM_NODES} - 1 ))); do
 		--data-dir="${NODE_DATA_DIR}" \
 		${BOOTSTRAP_ARG} \
 		--state-snapshot="${NETWORK_DIR}/genesis.ssz" \
-		"$@" \
+		${EXTRA_ARGS} \
 		> "${DATA_DIR}/log${NUM_NODE}.txt" 2>&1 &
 	if [[ "${PIDS}" == "" ]]; then
 		PIDS="$!"
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index 3367b6ca9..fe1b1a698 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit 3367b6ca908412c9e4e2faa8e0be1e40a40f595c
+Subproject commit fe1b1a698324cd754d9ef70722c7551ce32b6819
diff --git a/vendor/nim-eth b/vendor/nim-eth
index cb27813f3..22bf279b0 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit cb27813f3b4f2936f3f8c61c4791273b0df66d33
+Subproject commit 22bf279b0794f55e08344fe54beddf44d3ae9549
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 6a7f9f058..85d4baca9 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 6a7f9f058c04ecdfd26e5dbfd8df88221b8511e7
+Subproject commit 85d4baca958eb3e909c9a0bcde346914c2bae602
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 2c4faa537..088d3b7f6 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 2c4faa5372d2d8b0c2d16710fe5f93beab1c86af
+Subproject commit 088d3b7f6843fd61c829a5a0c0c29912945963ae