diff --git a/Cargo.lock b/Cargo.lock
index af4c3898a..ae84cf281 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2521,6 +2521,17 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "pem"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b"
+dependencies = [
+ "base64 0.12.3",
+ "once_cell",
+ "regex",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -2924,7 +2935,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d6cbbf5f43710b9242a4897f4671a469198e2d826d9df043fc16e046f45d8a"
 dependencies = [
  "chrono",
- "pem",
+ "pem 0.6.1",
+ "ring",
+ "yasna",
+]
+
+[[package]]
+name = "rcgen"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4974f7e96ee51fa3c90c3022e02c3a7117e71cb2a84518a55e44360135200c25"
+dependencies = [
+ "chrono",
+ "pem 0.8.1",
  "ring",
  "yasna",
 ]
@@ -4175,7 +4198,7 @@ dependencies = [
  "pulldown-cmark",
  "rangeset",
  "ratelim",
- "rcgen",
+ "rcgen 0.7.0",
  "regex",
  "serde",
  "serde_json",
@@ -4211,7 +4234,6 @@ dependencies = [
  "codec",
  "config",
  "filedescriptor",
- "foreign-types-shared",
  "hostname",
  "libc",
  "log",
@@ -4221,7 +4243,7 @@ dependencies = [
  "pretty_env_logger",
  "promise",
  "rangeset",
- "rcgen",
+ "rcgen 0.8.5",
  "smol",
  "structopt",
  "uds_windows",
diff --git a/wezterm-mux-server/Cargo.toml b/wezterm-mux-server/Cargo.toml
index 23e955ced..d15f726ec 100644
--- a/wezterm-mux-server/Cargo.toml
+++ b/wezterm-mux-server/Cargo.toml
@@ -11,7 +11,6 @@ anyhow = "1.0"
 codec = { path = "../codec" }
 config = { path = "../config" }
 filedescriptor = { version="0.7", path = "../filedescriptor" }
-foreign-types-shared = "0.1.1" # to peek into SslStream's SSL
 hostname = "0.3"
 libc = "0.2"
 log = "0.4"
@@ -21,7 +20,7 @@ portable-pty = { path = "../pty", features = ["serde_support"]}
 pretty_env_logger = "0.4"
 promise = { path = "../promise" }
 rangeset = { path = "../rangeset" }
-rcgen = "0.7"
+rcgen = "0.8"
 smol = "1.2"
 structopt = "0.3"
 umask = { path = "../umask" }
diff --git a/wezterm-mux-server/src/pki.rs b/wezterm-mux-server/src/pki.rs
index 2d88f680a..584309eb2 100644
--- a/wezterm-mux-server/src/pki.rs
+++ b/wezterm-mux-server/src/pki.rs
@@ -10,7 +10,7 @@ use std::path::PathBuf;
 /// channel (eg: ssh to reach the host, then unix domain to access
 /// the server) to make a request for the key information.
 /// We'll generate that request a new client cert and return
-/// both the public CA certificate informat and that key to the client.
+/// both the public CA certificate information and that key to the client.
 /// The client will use both of those things to connect to the TLS
 /// server.
 pub struct Pki {
diff --git a/wezterm/src/server/client.rs b/wezterm/src/server/client.rs
index 4af337e62..3af9299e8 100644
--- a/wezterm/src/server/client.rs
+++ b/wezterm/src/server/client.rs
@@ -855,7 +855,7 @@ impl Client {
                 let msg = format!(
                     "Please install the same version of wezterm on both \
                      the client and server! \
-                     The server reported error {} while being asked for its \
+                     The server reported error '{}' while being asked for its \
                      version.  This likely means that the server is older \
                      than the client.",
                     err