diff --git a/kokoro/ubuntu/build.sh b/kokoro/ubuntu/build.sh
index 64c6ce64c0..c95ee88d46 100644
--- a/kokoro/ubuntu/build.sh
+++ b/kokoro/ubuntu/build.sh
@@ -20,9 +20,11 @@ cd $(dirname $0)/../..
 
 if which gcc; then
   gcc --version
-  CC=gcc bazel test --test_output=errors ...
   CC=gcc bazel test -c opt --test_output=errors ... -- -benchmarks:benchmark
-  CC=gcc bazel test --test_output=errors ... --//:fasttable_enabled=true -- -cmake:test_generated_files -benchmarks:benchmark
+  if [[ $(uname) = "Linux" ]]; then
+    CC=gcc bazel test --test_output=errors ...
+    CC=gcc bazel test --test_output=errors ... --//:fasttable_enabled=true -- -cmake:test_generated_files -benchmarks:benchmark
+  fi
   # TODO: work through these errors and enable this.
   # if gcc -fanalyzer -x c /dev/null -c -o /dev/null; then
   #   CC=gcc bazel test --copt=-fanalyzer --test_output=errors ...
diff --git a/upb/decode.int.h b/upb/decode.int.h
index 631be1742b..dbec3da8e5 100644
--- a/upb/decode.int.h
+++ b/upb/decode.int.h
@@ -10,7 +10,6 @@
 
 #include "upb/msg.h"
 #include "upb/upb.int.h"
-#include "upb/decode_fast.h"
 
 /* Must be last. */
 #include "upb/port_def.inc"
@@ -68,7 +67,7 @@ UPB_INLINE intptr_t decode_totable(const upb_msglayout *tablep) {
 }
 
 UPB_INLINE const upb_msglayout *decode_totablep(intptr_t table) {
-  return (void*)(table >> 8);
+  return (const upb_msglayout*)(table >> 8);
 }
 
 UPB_INLINE
diff --git a/upbc/generator.cc b/upbc/generator.cc
index e0bfa8c2b5..f4d1bb9b8d 100644
--- a/upbc/generator.cc
+++ b/upbc/generator.cc
@@ -3,6 +3,7 @@
 
 #include <memory>
 
+#include "absl/base/attributes.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_replace.h"
@@ -803,7 +804,7 @@ bool TryFillTableEntry(const protobuf::Descriptor* message,
         type = "s";
         break;
       }
-      /* Fallthrough. */
+      ABSL_FALLTHROUGH_INTENDED;
     case protobuf::FieldDescriptor::TYPE_BYTES:
       type = "b";
       break;