diff --git a/Cargo.lock b/Cargo.lock
index 1830c6d..dc3c35d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -121,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.0.14"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"
+checksum = "6d76c22c9b9b215eeb8d016ad3a90417bd13cb24cf8142756e6472445876cab7"
 dependencies = [
  "atty",
  "bitflags",
@@ -153,8 +153,8 @@ dependencies = [
  "crossterm_winapi",
  "futures-core",
  "libc",
- "mio",
- "parking_lot 0.12.0",
+ "mio 0.7.14",
+ "parking_lot",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -324,15 +324,6 @@ dependencies = [
  "hashbrown",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.117"
@@ -419,6 +410,19 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "mio"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
+dependencies = [
+ "libc",
+ "log",
+ "miow",
+ "ntapi",
+ "winapi",
+]
+
 [[package]]
 name = "mio-serial"
 version = "5.0.1"
@@ -426,7 +430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6f47dcdec193b77e2166faa0e3be4ee04f324ce6780c54efe7af6c3ee7360e4"
 dependencies = [
  "log",
- "mio",
+ "mio 0.7.14",
  "nix 0.22.3",
  "serialport",
  "winapi",
@@ -517,17 +521,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.0"
@@ -535,21 +528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.1",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -677,7 +656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.7.14",
  "signal-hook",
 ]
 
@@ -724,6 +703,16 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -764,19 +753,20 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e"
 
 [[package]]
 name = "tokio"
-version = "1.16.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
 dependencies = [
  "bytes",
  "libc",
  "memchr",
- "mio",
+ "mio 0.8.0",
  "num_cpus",
  "once_cell",
- "parking_lot 0.11.2",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
+ "socket2",
  "tokio-macros",
  "winapi",
 ]
diff --git a/bin/chainofcommand/Cargo.toml b/bin/chainofcommand/Cargo.toml
index b0d4975..2b95dea 100644
--- a/bin/chainofcommand/Cargo.toml
+++ b/bin/chainofcommand/Cargo.toml
@@ -12,13 +12,13 @@ edition = "2021"
 maintenance = { status = "experimental" }
 
 [dependencies]
-clap = "3.0"
+clap = "3.1"
 seahash = "4.1"
 anyhow = "1.0"
 fehler = "1.0"
 crossterm = { version = "0.23", features = ["event-stream"] }
 tokio-serial = "5.4"
-tokio = { version = "1.16", features = ["full"] }
+tokio = { version = "1.17", features = ["full"] }
 futures = "0.3"
 defer = "0.1"
 tokio-util = { version = "0.7", features = ["codec"] }
diff --git a/bin/chainofcommand/src/main.rs b/bin/chainofcommand/src/main.rs
index 5cce185..bdcfd8c 100644
--- a/bin/chainofcommand/src/main.rs
+++ b/bin/chainofcommand/src/main.rs
@@ -3,7 +3,7 @@
 use {
     anyhow::{anyhow, Result},
     bytes::Bytes,
-    clap::{App, AppSettings, Arg},
+    clap::{Arg, Command},
     crossterm::{
         cursor,
         event::{Event, EventStream, KeyCode, KeyEvent, KeyModifiers},
@@ -304,9 +304,9 @@ fn handle_key_event(key_event: KeyEvent) -> Option<Bytes> {
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let matches = App::new("ChainOfCommand - command chainboot protocol")
+    let matches = Command::new("ChainOfCommand - command chainboot protocol")
         .about("Use to send freshly built kernel to chainboot-compatible boot loader")
-        .setting(AppSettings::DisableVersionFlag)
+        .disable_version_flag(true)
         .arg(
             Arg::new("port")
                 .help("The device path to a serial port, e.g. /dev/ttyUSB0")
@@ -315,7 +315,7 @@ async fn main() -> Result<()> {
         .arg(
             Arg::new("baud")
                 .help("The baud rate to connect at")
-                .use_delimiter(false)
+                .use_value_delimiter(false)
                 .required(true), // .validator(valid_baud),
         )
         .arg(