diff --git a/launcher/InstanceProxyModel.cpp b/launcher/InstanceProxyModel.cpp
index 0311c239..9ee38a65 100644
--- a/launcher/InstanceProxyModel.cpp
+++ b/launcher/InstanceProxyModel.cpp
@@ -5,6 +5,10 @@
 
 InstanceProxyModel::InstanceProxyModel(QObject *parent) : GroupedProxyModel(parent)
 {
+    m_naturalSort.setNumericMode(true);
+    m_naturalSort.setCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
+    // FIXME: use loaded translation as source of locale instead, hook this up to translation changes
+    m_naturalSort.setLocale(QLocale::system());
 }
 
 QVariant InstanceProxyModel::data(const QModelIndex & index, int role) const
@@ -29,6 +33,6 @@ bool InstanceProxyModel::subSortLessThan(const QModelIndex &left,
     }
     else
     {
-        return QString::localeAwareCompare(pdataLeft->name(), pdataRight->name()) < 0;
+        return m_naturalSort.compare(pdataLeft->name(), pdataRight->name()) < 0;
     }
 }
diff --git a/launcher/InstanceProxyModel.h b/launcher/InstanceProxyModel.h
index fab6f834..baf2794b 100644
--- a/launcher/InstanceProxyModel.h
+++ b/launcher/InstanceProxyModel.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "groupview/GroupedProxyModel.h"
+#include <QCollator>
 
 /**
  * A proxy model that is responsible for sorting instances into groups
@@ -13,4 +14,6 @@ public:
 
 protected:
     virtual bool subSortLessThan(const QModelIndex &left, const QModelIndex &right) const override;
+private:
+    QCollator m_naturalSort;
 };
diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index d78d6505..81c61ab0 100644
--- a/launcher/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
@@ -142,8 +142,12 @@ void JavaChecker::error(QProcess::ProcessError err)
 {
     if(err == QProcess::FailedToStart)
     {
-        killTimer.stop();
         qDebug() << "Java checker has failed to start.";
+        qDebug() << "Process environment:";
+        qDebug() << process->environment();
+        qDebug() << "Native environment:";
+        qDebug() << QProcessEnvironment::systemEnvironment().toStringList();
+        killTimer.stop();
         JavaCheckResult result;
         {
             result.path = m_path;
diff --git a/notsecrets/launcher.rc b/notsecrets/launcher.rc
index d7e80888..f84104fb 100644
--- a/notsecrets/launcher.rc
+++ b/notsecrets/launcher.rc
@@ -3,8 +3,8 @@
 #endif
 #include <windows.h>
 
-IDI_ICON1               ICON    DISCARDABLE     "Laucher.ico"
-1 RT_MANIFEST "Laucher.manifest"
+IDI_ICON1               ICON    DISCARDABLE     "Launcher.ico"
+1 RT_MANIFEST "Launcher.manifest"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     1,0,0,0
@@ -18,7 +18,7 @@ BEGIN
                         VALUE "CompanyName", "MultiMC Contributors"
                         VALUE "FileDescription", "A Minecraft Launcher"
                         VALUE "FileVersion", "1.0.0.0"
-                        VALUE "ProductName", "Laucher"
+                        VALUE "ProductName", "Launcher"
                         VALUE "ProductVersion", "5"
                 END
         END