diff --git a/WORKSPACE b/WORKSPACE
index 81754e6..5d95d65 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -29,7 +29,10 @@
     name = "io_bazel_rules_closure",
     sha256 = "b9c2bc6ba377aa497eb7c31681d34404febf9d4e3c9c7d98ce0d78238a0af20f",
     strip_prefix = "rules_closure-0.31",
-    urls = ["https://github.com/davido/rules_closure/archive/V0.31.tar.gz"],
+    urls = [
+        "https://github.com/davido/rules_closure/archive/V0.31.tar.gz",
+        "https://gerrit-ci.gerritforge.com/lib/V0.31.tar.gz",
+    ],
 )
 
 # File is specific to Polymer and copied from the Closure Github -- should be
diff --git a/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanFactory.java b/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanFactory.java
index 9befe16a..ef0ced6 100644
--- a/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanFactory.java
+++ b/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanFactory.java
@@ -20,10 +20,11 @@
 import java.lang.management.OperatingSystemMXBean;
 import java.util.Arrays;
 
-@SuppressWarnings("restriction")
 class OperatingSystemMXBeanFactory {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
+  private OperatingSystemMXBeanFactory() {}
+
   static OperatingSystemMXBeanInterface create() {
     OperatingSystemMXBean sys = ManagementFactory.getOperatingSystemMXBean();
     if (sys instanceof UnixOperatingSystemMXBean) {
diff --git a/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanUnixNative.java b/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanUnixNative.java
index a7f5bba..fbde058 100644
--- a/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanUnixNative.java
+++ b/java/com/google/gerrit/metrics/proc/OperatingSystemMXBeanUnixNative.java
@@ -16,7 +16,6 @@
 
 import com.sun.management.UnixOperatingSystemMXBean;
 
-@SuppressWarnings("restriction")
 class OperatingSystemMXBeanUnixNative implements OperatingSystemMXBeanInterface {
   private final UnixOperatingSystemMXBean sys;