diff --git a/.bazelrc b/.bazelrc
index e3690a1..6da2dfe 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2023-2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
 
 # Build configurations for the project
 build --action_env=BAZEL_CXXOPTS="-std=c++17"
-build --action_env=CC="clang"
+build --action_env=CC="clang" 
 
 # Disable warnings we don't care about or that generally have a low signal/noise
 # ratio.
 
-build --copt=-Wno-unused-function
-build --host_copt=-Wno-unused-function
\ No newline at end of file
+build --copt=-Wno-unused-function --cxxopt="-std=c++17"
+build --host_copt=-Wno-unused-function --host_cxxopt="-std=c++17"
diff --git a/cheriot/cheriot_top.cc b/cheriot/cheriot_top.cc
index 90a2adb..2a5edae 100644
--- a/cheriot/cheriot_top.cc
+++ b/cheriot/cheriot_top.cc
@@ -393,7 +393,7 @@
       halted_ = false;
       halt_reason_ = *HaltReason::kNone;
       need_to_step_over_ = false;
-      pc = next_pc;
+      pc = state_->pc_operand()->AsUint64(0);
       continue;
     }
     break;
@@ -501,7 +501,7 @@
         // Reset the halt reason and continue;
         halted_ = false;
         halt_reason_ = *HaltReason::kNone;
-        pc = next_pc;
+        pc = state_->pc_operand()->AsUint64(0);
         continue;
       }
       break;
diff --git a/repos.bzl b/repos.bzl
index 5747c12..805ef8c 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 = "dc445cff3d5557be6d6165fc48a6c754e7780b742806bd6647ac01c97728810a",
-            strip_prefix = "mpact-riscv-c1bbc85c94a5f7db012180dd717f20c1e5c07510",
-            url = "https://github.com/google/mpact-riscv/archive/c1bbc85c94a5f7db012180dd717f20c1e5c07510.tar.gz",
+            sha256 = "5764187b6a7817279422e7fe8b77dfd6813f826a54e9fea00c02f945f88f28a5",
+            strip_prefix = "mpact-riscv-31267652ea062c2031e1ff5043f43bbde7d3e37d",
+            url = "https://github.com/google/mpact-riscv/archive/31267652ea062c2031e1ff5043f43bbde7d3e37d.tar.gz",
         )