diff --git a/cheriot/cheriot_cli_forwarder.h b/cheriot/cheriot_cli_forwarder.h
index 04368e4..a07386a 100644
--- a/cheriot/cheriot_cli_forwarder.h
+++ b/cheriot/cheriot_cli_forwarder.h
@@ -53,20 +53,22 @@
   // given access type (load/store) will halt execution following the completion
   // of that access.
   absl::Status SetDataWatchpoint(uint64_t address, size_t length,
-                                 AccessType access_type);
+                                 AccessType access_type) override;
   // Clear data watchpoint for the given memory address and access type.
-  absl::Status ClearDataWatchpoint(uint64_t address, AccessType access_type);
+  absl::Status ClearDataWatchpoint(uint64_t address,
+                                   AccessType access_type) override;
 
   // Set an action point at the given address to execute the specified action.
   absl::StatusOr<int> SetActionPoint(
-      uint64_t address, absl::AnyInvocable<void(uint64_t, int)> action);
+      uint64_t address,
+      absl::AnyInvocable<void(uint64_t, int)> action) override;
   // Clear action point id at the given address.
-  absl::Status ClearActionPoint(uint64_t address, int id);
+  absl::Status ClearActionPoint(uint64_t address, int id) override;
   // Enable/disable action id at the given address.
-  absl::Status EnableAction(uint64_t address, int id);
-  absl::Status DisableAction(uint64_t address, int id);
+  absl::Status EnableAction(uint64_t address, int id) override;
+  absl::Status DisableAction(uint64_t address, int id) override;
   // Enable breaking on control flow change.
-  void SetBreakOnControlFlowChange(bool value);
+  void SetBreakOnControlFlowChange(bool value) override;
   // Request that core stop running.
   absl::Status Halt() override;
   // Step the core by num instructions.
@@ -121,7 +123,6 @@
 
  private:
   CheriotRenodeCLITop *cheriot_cli_top_;
-  CLIForwarder *cli_forwarder_;
 };
 
 }  // namespace cheriot
diff --git a/repos.bzl b/repos.bzl
index 7692c61..5747c12 100644
--- a/repos.bzl
+++ b/repos.bzl
@@ -22,7 +22,7 @@
     if not native.existing_rule("com_google_mpact-riscv"):
         http_archive(
             name = "com_google_mpact-riscv",
-            sha256 = "7c12d949d13ce86d61fa360d562cff5cd10a7cf9c25a10bee7cba1d852c503f7",
-            strip_prefix = "mpact-riscv-59226a24935d2a0036c797c44c472c8b538af662",
-            url = "https://github.com/google/mpact-riscv/archive/59226a24935d2a0036c797c44c472c8b538af662.tar.gz",
+            sha256 = "dc445cff3d5557be6d6165fc48a6c754e7780b742806bd6647ac01c97728810a",
+            strip_prefix = "mpact-riscv-c1bbc85c94a5f7db012180dd717f20c1e5c07510",
+            url = "https://github.com/google/mpact-riscv/archive/c1bbc85c94a5f7db012180dd717f20c1e5c07510.tar.gz",
         )