Add fixes
diff --git a/BUILD b/BUILD
index 1f6a0cf..d19f6fc 100644
--- a/BUILD
+++ b/BUILD
@@ -4,10 +4,10 @@
 
 filegroup(
     name = "distribution",
-    srcs = glob([
+    srcs = [
         "BUILD",
         "LICENSE",
         "*.bzl",
-    ]),
+    ],
     visibility = ["@//distro:__pkg__"],
 )
diff --git a/java/defs.bzl b/java/defs.bzl
index 6d24f52..5cbc08c 100644
--- a/java/defs.bzl
+++ b/java/defs.bzl
@@ -32,6 +32,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_binary(**_add_tags(attrs))
 
 def java_import(**attrs):
@@ -42,6 +43,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_import(**_add_tags(attrs))
 
 def java_library(**attrs):
@@ -52,6 +54,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_library(**_add_tags(attrs))
 
 def java_lite_proto_library(**attrs):
@@ -62,6 +65,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_lite_proto_library(**_add_tags(attrs))
 
 def java_proto_library(**attrs):
@@ -72,6 +76,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_proto_library(**_add_tags(attrs))
 
 def java_test(**attrs):
@@ -82,6 +87,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_test(**_add_tags(attrs))
 
 def java_package_configuration(**attrs):
@@ -92,6 +98,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_package_configuration(**_add_tags(attrs))
 
 def java_plugin(**attrs):
@@ -102,6 +109,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_plugin(**_add_tags(attrs))
 
 def java_runtime(**attrs):
@@ -112,6 +120,7 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_runtime(**_add_tags(attrs))
 
 def java_toolchain(**attrs):
@@ -122,4 +131,5 @@
     Args:
       **attrs: Rule attributes
     """
+    # buildifier: disable=native-java
     native.java_toolchain(**_add_tags(attrs))
diff --git a/java/repositories.bzl b/java/repositories.bzl
index 93a4b92..21583cd 100644
--- a/java/repositories.bzl
+++ b/java/repositories.bzl
@@ -21,6 +21,8 @@
 # Ideally we'd remove anything in this file except for rules_java_toolchains(),
 # which is being invoked as part of the federation setup.
 
+"""Development and production dependencies of rules_java."""
+
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
@@ -127,14 +129,16 @@
     )
 
 def remote_jdk9_repos():
-    # OpenJDK distributions that should only be downloaded on demand (e.g. when
-    # building a java_library or a genrule that uses java make variables).
-    # This will allow us to stop bundling the full JDK with Bazel.
-    # Note that while these are currently the same as the openjdk_* rules in
-    # Bazel's WORKSPACE file, but they don't have to be the same.
+    """OpenJDK distributions that should only be downloaded on demand.
 
-    # The source-code for this OpenJDK can be found at:
-    # https://openjdk.linaro.org/releases/jdk9-src-1708.tar.xz
+    E.g. when building a java_library or a genrule that uses java make
+    variables).  This will allow us to stop bundling the full JDK with Bazel.
+    Note that while these are currently the same as the openjdk_* rules in
+    Bazel's WORKSPACE file, but they don't have to be the same.
+
+    The source-code for this OpenJDK can be found at:
+    https://openjdk.linaro.org/releases/jdk9-src-1708.tar.xz
+    """
     maybe(
         http_archive,
         name = "remote_jdk9_linux_aarch64",