diff --git a/cheriot/cheriot_renode.cc b/cheriot/cheriot_renode.cc
index 142336c..1bfb52c 100644
--- a/cheriot/cheriot_renode.cc
+++ b/cheriot/cheriot_renode.cc
@@ -350,7 +350,7 @@
   std::string dcache_cfg;
   uint64_t tagged_memory_base = 0;
   uint64_t tagged_memory_size = 0;
-  uint64_t revocation_memory_base = 0;
+  [[maybe_unused]] uint64_t revocation_memory_base = 0;
   uint64_t clint_mmr_base = 0;
   uint64_t clint_period = 100;  // 100 by default.
   bool do_inst_profile = false;
diff --git a/cheriot/cheriot_renode.h b/cheriot/cheriot_renode.h
index c61db7a..e356468 100644
--- a/cheriot/cheriot_renode.h
+++ b/cheriot/cheriot_renode.h
@@ -146,7 +146,7 @@
  private:
   std::string name_;
   MemoryInterface* renode_sysbus_ = nullptr;
-  TaggedMemoryInterface* data_memory_ = nullptr;
+  [[maybe_unused]] TaggedMemoryInterface* data_memory_ = nullptr;
   TaggedMemoryInterface* tagged_sysbus_ = nullptr;
   CheriotState* cheriot_state_ = nullptr;
   DecoderInterface* cheriot_decoder_ = nullptr;
diff --git a/cheriot/test/riscv_cheriot_vector_fp_unary_instructions_test.cc b/cheriot/test/riscv_cheriot_vector_fp_unary_instructions_test.cc
index 9e36ced..218e31c 100644
--- a/cheriot/test/riscv_cheriot_vector_fp_unary_instructions_test.cc
+++ b/cheriot/test/riscv_cheriot_vector_fp_unary_instructions_test.cc
@@ -896,10 +896,6 @@
   if (vs2 == 0.0) return std::make_tuple(vs2, 0);
   if (std::isnan(vs2) || (vs2 < 0.0)) {
     auto val = FPTypeInfo<T>::kCanonicalNaN;
-    uint32_t flags = 0;
-    if (!mpact::sim::generic::FPTypeInfo<T>::IsQNaN(vs2)) {
-      flags = (uint32_t)FPExceptions::kInvalidOp;
-    }
     return std::make_tuple(*reinterpret_cast<const T*>(&val),
                            (uint32_t)FPExceptions::kInvalidOp);
   }
diff --git a/repos.bzl b/repos.bzl
index 3356bb6..50fa462 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 = "0c0e467282309ae5a979f222bf1962afdf76fd7a8aa00ce397ef5a8429422884",
-            strip_prefix = "mpact-riscv-59d15ec3112f72c7ac3f61dac92821de56c22885",
-            url = "https://github.com/google/mpact-riscv/archive/59d15ec3112f72c7ac3f61dac92821de56c22885.tar.gz",
+            sha256 = "ebf78b40e37fd3a537ad58f7705a7e04c7b06c46e6f0d1792fe858e218ca956b",
+            strip_prefix = "mpact-riscv-e454c1b14676888a1ffac9546c256c7b9d2de45e",
+            url = "https://github.com/google/mpact-riscv/archive/e454c1b14676888a1ffac9546c256c7b9d2de45e.tar.gz",
         )