diff --git a/src/trace-forwarder/README.md b/src/trace-forwarder/README.md
index b16bcc9f57..8099b7beab 100644
--- a/src/trace-forwarder/README.md
+++ b/src/trace-forwarder/README.md
@@ -120,7 +120,7 @@ forwarder.
 
 ```bash
 $ sandbox_id="foo"
-$ socket_path=$(echo "$socket_path_template" | sed "s/{ID}/${sandbox_id}/g")
+$ socket_path=$(echo "$socket_path_template" | sed "s/{ID}/${sandbox_id}/g" | tr -d '"')
 $ sudo mkdir -p $(dirname "$socket_path")
 ```
 
diff --git a/tools/agent-ctl/src/client.rs b/tools/agent-ctl/src/client.rs
index abe58951cd..9113639316 100644
--- a/tools/agent-ctl/src/client.rs
+++ b/tools/agent-ctl/src/client.rs
@@ -87,6 +87,11 @@ static AGENT_CMDS: &'static [AgentCmd] = &[
         st: ServiceType::Agent,
         fp: agent_cmd_sandbox_add_arp_neighbors,
     },
+    AgentCmd {
+        name: "AddSwap",
+        st: ServiceType::Agent,
+        fp: agent_cmd_sandbox_add_swap,
+    },
     AgentCmd {
         name: "Check",
         st: ServiceType::Health,
@@ -1918,3 +1923,29 @@ fn get_repeat_count(cmdline: &str) -> i64 {
         Err(_) => return default_repeat_count,
     }
 }
+
+fn agent_cmd_sandbox_add_swap(
+    ctx: &Context,
+    client: &AgentServiceClient,
+    _health: &HealthClient,
+    _options: &mut Options,
+    _args: &str,
+) -> Result<()> {
+    let req = AddSwapRequest::default();
+
+    let ctx = clone_context(ctx);
+
+    debug!(sl!(), "sending request"; "request" => format!("{:?}", req));
+
+    let reply = client
+        .add_swap(ctx, &req)
+        .map_err(|e| anyhow!("{:?}", e).context(ERR_API_FAILED))?;
+
+    // FIXME: Implement 'AddSwap' fully.
+    eprintln!("FIXME: 'AddSwap' not fully implemented");
+
+    info!(sl!(), "response received";
+        "response" => format!("{:?}", reply));
+
+    Ok(())
+}