diff --git a/sandboxed_api/sandbox2/BUILD.bazel b/sandboxed_api/sandbox2/BUILD.bazel
index 5d54466..2271b46 100644
--- a/sandboxed_api/sandbox2/BUILD.bazel
+++ b/sandboxed_api/sandbox2/BUILD.bazel
@@ -168,6 +168,7 @@ cc_library(
     deps = [
         ":bpfdisassembler",
         ":comms",
+        ":fs",
         ":namespace",
         ":regs",
         ":syscall",
@@ -270,6 +271,7 @@ cc_library(
         ":violation_proto_cc",
         ":forkserver",
         ":forkserver_proto_cc",
+        ":fs",
         ":global_forkserver",
         ":ipc",
         ":limits",
@@ -279,6 +281,7 @@ cc_library(
         ":notify",
         ":policy",
         ":regs",
+        ":reporter",
         ":result",
         ":syscall",
         ":util",
diff --git a/sandboxed_api/tools/generator2/BUILD b/sandboxed_api/tools/generator2/BUILD
index b340022..65d0c3e 100644
--- a/sandboxed_api/tools/generator2/BUILD
+++ b/sandboxed_api/tools/generator2/BUILD
@@ -28,6 +28,7 @@ py_test(
         "code_test.py",
         "code_test_util.py",
     ],
+    python_version = "PY2",
     deps = [
         ":code",
         "@com_google_absl_py//absl/testing:absltest",
@@ -38,6 +39,7 @@ py_test(
 py_binary(
     name = "sapi_generator",
     srcs = ["sapi_generator.py"],
+    python_version = "PY2",
     visibility = ["//visibility:public"],
     deps = [
         ":code",
diff --git a/sandboxed_api/util/BUILD.bazel b/sandboxed_api/util/BUILD.bazel
index babb2b8..9fd8ea8 100644
--- a/sandboxed_api/util/BUILD.bazel
+++ b/sandboxed_api/util/BUILD.bazel
@@ -76,6 +76,7 @@ cc_test(
     name = "status_test",
     srcs = ["status_test.cc"],
     deps = [
+        ":status",
         ":status_matchers",
         "@com_google_googletest//:gtest_main",
     ],