diff --git a/pom.xml b/pom.xml
index 0f1a79dd5..d99da6b55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 
     <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
     <checkstyle.version>13.6.0</checkstyle.version>
-    <error-prone.version>2.49.0</error-prone.version>
+    <error-prone.version>2.50.0</error-prone.version>
     <flatten-maven-plugin.version>1.7.3</flatten-maven-plugin.version>
     <maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
     <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
diff --git a/runtime/src/main/java/run/endive/runtime/MemCopyWorkaround.java b/runtime/src/main/java/run/endive/runtime/MemCopyWorkaround.java
index 4b1a08c34..6f1edd4e7 100644
--- a/runtime/src/main/java/run/endive/runtime/MemCopyWorkaround.java
+++ b/runtime/src/main/java/run/endive/runtime/MemCopyWorkaround.java
@@ -68,8 +68,8 @@ public static boolean shouldUseMemWorkaround(String version) {
         }
     }
 
-    static MemoryCopyFunc memoryCopyFunc;
-    static I32GEUFunc i32geuFunc;
+    private static MemoryCopyFunc memoryCopyFunc;
+    private static I32GEUFunc i32geuFunc;
 
     public static void memoryCopy(int destination, int offset, int size, Memory memory) {
         memoryCopyFunc.apply(destination, offset, size, memory);
diff --git a/wasm/src/main/java/run/endive/wasm/Validator.java b/wasm/src/main/java/run/endive/wasm/Validator.java
index 8b9bed02f..2eb35de88 100644
--- a/wasm/src/main/java/run/endive/wasm/Validator.java
+++ b/wasm/src/main/java/run/endive/wasm/Validator.java
@@ -254,7 +254,7 @@ private void setLocal(int idx) {
 
     private void resetLocals(int height) {
         while (initStack.size() > height) {
-            localsInitialized.set(initStack.remove(initStack.size() - 1), false);
+            localsInitialized.set(initStack.remove(/* index */ initStack.size() - 1), false);
         }
     }