diff --git a/target/cheri-common/cheri_tagmem.h b/target/cheri-common/cheri_tagmem.h
index 7377120dd9..cd51395f9d 100644
--- a/target/cheri-common/cheri_tagmem.h
+++ b/target/cheri-common/cheri_tagmem.h
@@ -56,11 +56,10 @@
  * developers want a "fast but not precise" singlecore, we could have locks off.
  *
  * If we want to throw caution to wind and really optimise the single thread
- * case, it should be noted qemu_tcg_mttcg_enabled is dynamic and so will
- * still be generating an extra branch. TARGET_SUPPORTS_MTTCG is the
- * static thing. Although qemu_tcg_mttcg_enabled will default to false if
- * TARGET_SUPPORTS_MTTCG is undefined, it can be still be overridden on the
- * command line.
+ * case, it should be noted need_concurrent_tags is dynamic and so will
+ * still be generating a few extra branchs. TARGET_SUPPORTS_MTTCG is the
+ * static thing we could use if we want to compile an extra fast but single-core
+ * only binary.
  */
 
 #define UNSAFE_SINGLE_CORE true
diff --git a/target/riscv/op_helper_cheri.c b/target/riscv/op_helper_cheri.c
index 1582e140e0..1fa7ff9035 100644
--- a/target/riscv/op_helper_cheri.c
+++ b/target/riscv/op_helper_cheri.c
@@ -408,7 +408,7 @@ static target_ulong sc_c_impl(CPUArchState *env, uint32_t addr_reg,
     log_changed_special_reg(env, "load_res", env->load_res);
     bool store_fails;
     if (addr != expected_addr) {
-        store_fails = 1;
+        store_fails = true;
         goto sc_failed;
     }
     // Now perform the "cmpxchg" operation by checking if the current values