diff --git a/eden/fs/cli_rs/edenfs-commands/src/minitop.rs b/eden/fs/cli_rs/edenfs-commands/src/minitop.rs
index 43aaaaf12b1c7..fdf3387a52457 100644
--- a/eden/fs/cli_rs/edenfs-commands/src/minitop.rs
+++ b/eden/fs/cli_rs/edenfs-commands/src/minitop.rs
@@ -435,7 +435,7 @@ impl crate::Subcommand for MinitopCmd {
             if self.interactive {
                 queue!(stdout, terminal::Clear(terminal::ClearType::All))?;
             }
-            client.flushStatsNow();
+            client.flushStatsNow().await?;
             system.refresh_processes();
             cursor.refresh_terminal_size()?;
 
@@ -577,7 +577,7 @@ mod unix {
 
     use anyhow::anyhow;
     use anyhow::Result;
-    use shlex::quote;
+    use shlex::try_quote;
 
     pub fn trim_cmd_binary_path(cmd: &str) -> Result<String> {
         let mut parts: Vec<&str> = cmd.split(char::from(0)).collect();
@@ -598,7 +598,7 @@ mod unix {
                     // the first item is the cmd
                     String::from(part)
                 } else {
-                    quote(part).into_owned()
+                    try_quote(part).unwrap().into_owned()
                 }
             })
             .collect::<Vec<String>>()
diff --git a/eden/mononoke/mononoke_configs/src/lib.rs b/eden/mononoke/mononoke_configs/src/lib.rs
index 1c4cae3f1f4ed..a2c7f01e44254 100644
--- a/eden/mononoke/mononoke_configs/src/lib.rs
+++ b/eden/mononoke/mononoke_configs/src/lib.rs
@@ -5,8 +5,6 @@
  * GNU General Public License version 2.
  */
 
-#![feature(arc_unwrap_or_clone)]
-
 use std::path::Path;
 use std::sync::Arc;
 
diff --git a/eden/scm/lib/copytrace/src/tests.rs b/eden/scm/lib/copytrace/src/tests.rs
index 11c17bb13f689..d6669bbd977cf 100644
--- a/eden/scm/lib/copytrace/src/tests.rs
+++ b/eden/scm/lib/copytrace/src/tests.rs
@@ -377,10 +377,10 @@ async fn test_linear_multiple_renames_with_deletes() {
     let c = t.copy_trace().await;
 
     assert_trace_rename!(c A X, a -> d);
-    assert_trace_rename!(c A Z, a -> !-Z d);
+    assert_trace_rename!(c A Z, a -> ! - Z d);
 
     assert_trace_rename!(c Z B, b2 -> b2);
-    assert_trace_rename!(c Z A, b2 -> !+B b2);
+    assert_trace_rename!(c Z A, b2 -> ! + B b2);
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -440,8 +440,8 @@ async fn test_non_linear_multiple_renames_with_deletes() {
     let c = t.copy_trace().await;
 
     assert_trace_rename!(c Z 1000, a2 -> d);
-    assert_trace_rename!(c Z 1001, a2 -> !-1001 d);
-    assert_trace_rename!(c Z 1023, a2 -> !-1001 d);
+    assert_trace_rename!(c Z 1001, a2 -> ! - 1001 d);
+    assert_trace_rename!(c Z 1023, a2 -> ! - 1001 d);
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]