diff --git a/java/libraries/javafx/build.xml b/java/libraries/javafx/build.xml
index 6df92bddb..46c200463 100644
--- a/java/libraries/javafx/build.xml
+++ b/java/libraries/javafx/build.xml
@@ -148,7 +148,7 @@
       <param name="gluon.base" value="javafx-16-sdk-mac" />
       <!-- extract the .jar files from the first javafx we run across -->
       <!-- <param name="skip.jars" value="true" /> -->
-      <param name="natives.path" value="${library.path}/macosx64" />
+      <param name="natives.path" value="${library.path}/macosx" />
     </antcall>
 
     <antcall target="retrieve-gluon">
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
index bda659a62..6b37b79f2 100644
--- a/java/src/processing/mode/java/JavaBuild.java
+++ b/java/src/processing/mode/java/JavaBuild.java
@@ -853,7 +853,7 @@ public class JavaBuild {
 
       String lines[] = PApplet.loadStrings(plistTemplate);
       for (int i = 0; i < lines.length; i++) {
-        if (lines[i].indexOf("@@") != -1) {
+        if (lines[i].contains("@@")) {
           StringBuilder sb = new StringBuilder(lines[i]);
           int index = 0;
           while ((index = sb.indexOf("@@jvm_runtime@@")) != -1) {
diff --git a/todo.txt b/todo.txt
index 71e443154..db625a4e5 100755
--- a/todo.txt
+++ b/todo.txt
@@ -44,6 +44,10 @@ _ "WARNING: Unsupported JavaFX configuration" when running Tools that use JavaFX
 
 _ add JavaFX library to IntelliJ
 
+_ macosx vs macosx64 in JavaFX
+_   the latter is making the export fail because it won't embed a Java VM
+_   may be because it's exporting twice and overwriting? or 64 takes precedence?
+
 _ fix modules path warning for Tools in the PDE
 _ update for new modules path when running from the PDE
 _ update modules path when exporting application