diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java
index 65f1d2ed..231e8bee 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java
@@ -31,7 +31,6 @@ public class JMinecraftVersionList {
         public String mainClass;
         public String minecraftArguments;
         public int minimumLauncherVersion;
-        public DependentLibrary optifineLib;
         public String releaseTime;
         public String time;
         public String type;
diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
index e10f45e2..6ea3a037 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -420,11 +420,6 @@ public final class Tools
     public static JMinecraftVersionList.Version getVersionInfo(String versionName) {
         try {
             JMinecraftVersionList.Version customVer = Tools.GLOBAL_GSON.fromJson(read(DIR_HOME_VERSION + "/" + versionName + "/" + versionName + ".json"), JMinecraftVersionList.Version.class);
-            for (DependentLibrary lib : customVer.libraries) {
-                if (lib.name.startsWith(LIBNAME_OPTIFINE)) {
-                    customVer.optifineLib = lib;
-                }
-            }
             if (customVer.inheritsFrom == null || customVer.inheritsFrom.equals(customVer.id)) {
                 return customVer;
             } else {
@@ -434,7 +429,7 @@ public final class Tools
                 insertSafety(inheritsVer, customVer,
                              "assetIndex", "assets", "id",
                              "mainClass", "minecraftArguments",
-                             "optifineLib", "releaseTime", "time", "type"
+                             "releaseTime", "time", "type"
                              );
 
                 List<DependentLibrary> libList = new ArrayList<DependentLibrary>(Arrays.asList(inheritsVer.libraries));
@@ -455,7 +450,7 @@ public final class Tools
                             }
                         }
 
-                        if (libName != null) libList.add(lib);
+                        if (libName != null) libList.add(0, lib);
                     }
                 } finally {
                     inheritsVer.libraries = libList.toArray(new DependentLibrary[0]);
diff --git a/Natives/LauncherNavigationController.m b/Natives/LauncherNavigationController.m
index 6f7a7d90..5a1a767a 100644
--- a/Natives/LauncherNavigationController.m
+++ b/Natives/LauncherNavigationController.m
@@ -296,7 +296,9 @@
     remoteVersionList = nil;
 
     if (isJITEnabled()) {
-        handler();
+        dispatch_async(dispatch_get_main_queue(), ^{
+            handler();
+        });
         return;
     } else if ([getPreference(@"debug_skip_wait_jit") boolValue]) {
         NSLog(@"Debug option skipped waiting for JIT. Java might not work.");