diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index b596de8dbc..e21dbe2d22 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -61,17 +61,6 @@ filegroup(
     ),
 )
 
-filegroup(
-    name = "bower_components",
-    srcs = glob(
-        [
-            "bower_components/**/*.html",
-            "bower_components/**/*.js",
-            "bower_components/**/*.js.map",
-        ],
-    ),
-)
-
 genrule2(
     name = "pg_code_zip",
     srcs = [":pg_code"],
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js
index f11e5ed410..dfcacb49a4 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js
+++ b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config.js
@@ -76,9 +76,9 @@
     }
 
     /**
-     * @param {?boolean} value - fallback to false if undefined
+     * @param {string} value - fallback to 'false' if undefined
      */
-    _computeChecked(value = false) {
+    _computeChecked(value = 'false') {
       return JSON.parse(value);
     }
 
diff --git a/polygerrit-ui/app/rules.bzl b/polygerrit-ui/app/rules.bzl
index e1304e6aeb..cd4819a914 100644
--- a/polygerrit-ui/app/rules.bzl
+++ b/polygerrit-ui/app/rules.bzl
@@ -19,6 +19,7 @@ def polygerrit_bundle(name, srcs, outs, app):
         ],
         language = "ECMASCRIPT_2017",
         deps = [name + "_closure_lib"],
+        dependency_mode = "PRUNE_LEGACY",
     )
 
     # TODO(davido): Remove JSC_REFERENCE_BEFORE_DECLARE when this is fixed upstream:
diff --git a/tools/bzl/js.bzl b/tools/bzl/js.bzl
index 8805614ea9..b14a76163e 100644
--- a/tools/bzl/js.bzl
+++ b/tools/bzl/js.bzl
@@ -494,6 +494,7 @@ def polygerrit_plugin(name, app, srcs = [], deps = [], externs = [], assets = No
         deps = [
             name + "_closure_lib",
         ],
+        dependency_mode = "PRUNE_LEGACY",
     )
 
     if html_plugin:
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
index 0b4a52abda..2f5447b11e 100644
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -94,6 +94,7 @@ def _generate_build_files(ctx, binjar, srcjar):
         srcjar_attr = 'srcjar = "%s",' % srcjar
     contents = """
 {header}
+load("@rules_java//java:defs.bzl", "java_import")
 package(default_visibility = ['//visibility:public'])
 java_import(
     name = 'jar',