Small fixes
diff --git a/MODULE.bazel b/MODULE.bazel
index fdb4090..5f0377e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -25,7 +25,6 @@
 bazel_dep(name = "platforms", version = "0.0.4")
 bazel_dep(name = "rules_cc", version = "0.0.1")
 # rules_proto is required by @remote_java_tools, which is loaded via module extension.
-# TODO: perhaps java tools should have its own Bazel module, then we don't need this in rules_java.
 bazel_dep(name = "rules_proto", version = "4.0.0")
 
 toolchains = use_extension("//java:extensions.bzl", "toolchains")
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
index 8b8fba4..b021fa6 100644
--- a/WORKSPACE.bzlmod
+++ b/WORKSPACE.bzlmod
@@ -1 +1,2 @@
-# A completely empty WORKSPACE file to replace the original WORKSPACE content
+# A completely empty WORKSPACE file to replace the original WORKSPACE content when enabling Bzlmod.
+# No WORKSPACE prefix or suffix are added for this file.
diff --git a/java/extensions.bzl b/java/extensions.bzl
index 5ec4036..899f22e 100644
--- a/java/extensions.bzl
+++ b/java/extensions.bzl
@@ -16,8 +16,8 @@
 load("//java:repositories.bzl", "java_tools_repos", "local_jdk_repo", "remote_jdk11_repos", "remote_jdk15_repos", "remote_jdk16_repos", "remote_jdk17_repos")
 
 def _toolchains_impl(ctx):
-    local_jdk_repo()
     java_tools_repos()
+    local_jdk_repo()
     remote_jdk11_repos()
     remote_jdk15_repos()
     remote_jdk16_repos()