diff --git a/Cargo.lock b/Cargo.lock
index e2908933..860bf24a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -690,11 +690,26 @@ dependencies = [
  "atty",
  "bitflags",
  "strsim 0.8.0",
- "textwrap",
+ "textwrap 0.11.0",
  "unicode-width",
  "vec_map",
 ]
 
+[[package]]
+name = "clap"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12e8611f9ae4e068fa3e56931fded356ff745e70987ff76924a6e0ab1c8ef2e3"
+dependencies = [
+ "atty",
+ "bitflags",
+ "indexmap",
+ "os_str_bytes",
+ "strsim 0.10.0",
+ "termcolor",
+ "textwrap 0.14.2",
+]
+
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -830,7 +845,7 @@ checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
 dependencies = [
  "atty",
  "cast",
- "clap",
+ "clap 2.34.0",
  "criterion-plot",
  "csv",
  "itertools",
@@ -1836,8 +1851,8 @@ dependencies = [
  "android_logger",
  "backtrace",
  "byteorder",
- "cfg-if 0.1.10",
- "clap",
+ "cfg-if 1.0.0",
+ "clap 3.0.7",
  "core-foundation 0.9.2",
  "core-foundation-sys 0.8.3",
  "directories 4.0.1",
@@ -1848,7 +1863,6 @@ dependencies = [
  "log",
  "ndk",
  "ndk-glue",
- "owning_ref",
  "rpassword",
  "secret-service",
  "security-framework",
@@ -2444,6 +2458,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
+[[package]]
+name = "os_str_bytes"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "owning_ref"
 version = "0.4.1"
@@ -3522,6 +3545,12 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
+
 [[package]]
 name = "thiserror"
 version = "1.0.30"
@@ -3778,7 +3807,7 @@ dependencies = [
  "capnp-rpc",
  "capnpc",
  "cfg-if 0.1.10",
- "clap",
+ "clap 2.34.0",
  "config 0.10.1",
  "crossbeam-channel",
  "cursive",
@@ -3885,7 +3914,7 @@ dependencies = [
  "capnp-rpc",
  "capnpc",
  "cfg-if 0.1.10",
- "clap",
+ "clap 2.34.0",
  "config 0.11.0",
  "ctrlc",
  "daemonize",
diff --git a/external/keyring-manager b/external/keyring-manager
index 3713e105..1295d708 160000
--- a/external/keyring-manager
+++ b/external/keyring-manager
@@ -1 +1 @@
-Subproject commit 3713e10599c6078e058aab785ef46594420dc11b
+Subproject commit 1295d708ec42542f076a13db69eadc448a94f985