diff --git a/gerrit-antlr/BUILD b/gerrit-antlr/BUILD
index c955ab10ba..1176d17fa6 100644
--- a/gerrit-antlr/BUILD
+++ b/gerrit-antlr/BUILD
@@ -1,32 +1,32 @@
-load('//tools/bzl:genrule2.bzl', 'genrule2')
+load("//tools/bzl:genrule2.bzl", "genrule2")
 
 java_library(
-  name = 'query_exception',
-  srcs = ['src/main/java/com/google/gerrit/server/query/QueryParseException.java'],
-  visibility = ['//visibility:public'],
+    name = "query_exception",
+    srcs = ["src/main/java/com/google/gerrit/server/query/QueryParseException.java"],
+    visibility = ["//visibility:public"],
 )
 
 genrule2(
-  name = 'query_antlr',
-  srcs = ['src/main/antlr3/com/google/gerrit/server/query/Query.g'],
-  cmd = ' && '.join([
-    '$(location //lib/antlr:antlr-tool) -o $$TMP $<',
-    'cd $$TMP',
-    '$$ROOT/$(location @bazel_tools//tools/zip:zipper) cC $$ROOT/$@ $$(find .)'
-  ]),
-  tools = [
-    '@bazel_tools//tools/zip:zipper',
-    '//lib/antlr:antlr-tool',
-  ],
-  out = 'query_antlr.srcjar',
+    name = "query_antlr",
+    srcs = ["src/main/antlr3/com/google/gerrit/server/query/Query.g"],
+    out = "query_antlr.srcjar",
+    cmd = " && ".join([
+        "$(location //lib/antlr:antlr-tool) -o $$TMP $<",
+        "cd $$TMP",
+        "zip $$ROOT/$@ $$(find . -type f )",
+    ]),
+    tools = [
+        "//lib/antlr:antlr-tool",
+        "@bazel_tools//tools/zip:zipper",
+    ],
 )
 
 java_library(
-  name = 'query_parser',
-  srcs = [':query_antlr'],
-  deps = [
-    ':query_exception',
-    '//lib/antlr:java_runtime',
-  ],
-  visibility = ['//visibility:public'],
+    name = "query_parser",
+    srcs = [":query_antlr"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":query_exception",
+        "//lib/antlr:java_runtime",
+    ],
 )
diff --git a/lib/prolog/prolog.bzl b/lib/prolog/prolog.bzl
index 3afb031c56..d4e9e08448 100644
--- a/lib/prolog/prolog.bzl
+++ b/lib/prolog/prolog.bzl
@@ -22,7 +22,7 @@ def prolog_cafe_library(
   genrule2(
     name = name + '__pl2j',
     cmd = '$(location //lib/prolog:compiler_bin) ' +
-      '$$TMP $@ ' +
+      '$$(dirname $@) $@ ' +
       '$(SRCS)',
     srcs = srcs,
     tools = ['//lib/prolog:compiler_bin'],
diff --git a/tools/bzl/gwt.bzl b/tools/bzl/gwt.bzl
index 29987ef284..d16cecd9fe 100644
--- a/tools/bzl/gwt.bzl
+++ b/tools/bzl/gwt.bzl
@@ -18,9 +18,9 @@ load('//tools/bzl:java.bzl', 'java_library2')
 
 def gwt_module(gwt_xml=None, resources=[], srcs=[], **kwargs):
   if gwt_xml:
-    resources += [gwt_xml]
+    resources = resources + [gwt_xml]
   if srcs:
-    resources += srcs
+    resources = resources + srcs
 
   java_library2(
     srcs = srcs,
diff --git a/tools/bzl/java.bzl b/tools/bzl/java.bzl
index b0c3619ab8..5fca72404d 100644
--- a/tools/bzl/java.bzl
+++ b/tools/bzl/java.bzl
@@ -17,8 +17,8 @@
 
 def java_library2(deps=[], exported_deps=[], exports=[], **kwargs):
   if exported_deps:
-    deps += exported_deps
-    exports += exported_deps
+    deps = deps + exported_deps
+    exports = exports + exported_deps
   native.java_library(
     deps = deps,
     exports = exports,