diff --git a/benchmark.py b/benchmark.py
index 70a3cce118..55b682bc93 100755
--- a/benchmark.py
+++ b/benchmark.py
@@ -53,7 +53,7 @@ def Benchmark(outbase, bench_cpu=True, runs=12):
 
 
 baseline = "master"
-bench_cpu = True
+bench_cpu = False
 
 if len(sys.argv) > 1:
   baseline = sys.argv[1]
diff --git a/upb/json_decode.c b/upb/json_decode.c
index 15d305bb31..b02419328a 100644
--- a/upb/json_decode.c
+++ b/upb/json_decode.c
@@ -909,7 +909,7 @@ static void jsondec_field(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
     return;
   }
 
-  if (upb_fielddef_containingoneof(f) &&
+  if (upb_fielddef_realcontainingoneof(f) &&
       upb_msg_whichoneof(msg, upb_fielddef_containingoneof(f))) {
     jsondec_err(d, "More than one field for this oneof.");
   }
diff --git a/upbc/main.cc b/upbc/main.cc
index a9682a9c1a..3a38937797 100644
--- a/upbc/main.cc
+++ b/upbc/main.cc
@@ -1,5 +1,5 @@
 
-#include <google/protobuf/compiler/plugin.h>
+#include "google/protobuf/compiler/plugin.h"
 
 #include "upbc/generator.h"