diff --git a/launcher/ui/java/VersionList.cpp b/launcher/ui/java/VersionList.cpp
index 4bf04224a..dc454f264 100644
--- a/launcher/ui/java/VersionList.cpp
+++ b/launcher/ui/java/VersionList.cpp
@@ -114,7 +114,7 @@ void VersionList::sortVersions()
         std::sort(m_vlist.begin(), m_vlist.end(), sortJavas);
     } else {
         m_vlist = {};
-        qWarning() << "Your operating system is not yet supported: " << SysInfo::currentSystem() << " " << SysInfo::useQTForArch();
+        qWarning() << "No Java versions found for your operating system." << SysInfo::currentSystem() << " " << SysInfo::useQTForArch();
     }
     endResetModel();
 }
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index cb2a8b90b..95d5f581e 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -154,7 +154,7 @@ void JavaPage::on_javaDetectBtn_clicked()
         ui->javaPathTextBox->setText(java->path);
         if (!java->is_64bit && APPLICATION->settings()->get("MaxMemAlloc").toInt() > 2048) {
             CustomMessageBox::selectable(this, tr("Confirm Selection"),
-                                         tr("You selected an x86 java version.\n"
+                                         tr("You selected a 32 bit java version.\n"
                                             "This means that will not support more than 2048MiB of RAM.\n"
                                             "Please make sure that the maximum memory value is lower."),
                                          QMessageBox::Warning, QMessageBox::Ok, QMessageBox::Ok)
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index 8a63aab22..50cffc9a7 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -416,7 +416,7 @@ void InstanceSettingsPage::on_javaDetectBtn_clicked()
 
         if (!java->is_64bit && m_settings->get("MaxMemAlloc").toInt() > 2048) {
             CustomMessageBox::selectable(this, tr("Confirm Selection"),
-                                         tr("You selected an x86 java version.\n"
+                                         tr("You selected a 32 bit java version.\n"
                                             "This means that will not support more than 2048MiB of RAM.\n"
                                             "Please make sure that the maximum memory value is lower."),
                                          QMessageBox::Warning, QMessageBox::Ok, QMessageBox::Ok)
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 4b5819288..f8031687b 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -173,8 +173,8 @@ void JavaSettingsWidget::initialize()
     updateThresholds();
 
     auto button = CustomMessageBox::selectable(this, tr("Auto Java Download"),
-                                               tr("%1 has now the ability to auto downloand the correct java for each minecraft version.\n"
-                                                  "Do you want to enable java auto-download?\n")
+                                               tr("%1 can automatically download the correct Java version for each version of Minecraft..\n"
+                                                  "Do you want to enable Java auto-download?\n")
                                                    .arg(BuildConfig.LAUNCHER_DISPLAYNAME),
                                                QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)
                       ->exec();
@@ -505,7 +505,7 @@ void JavaSettingsWidget::updateThresholds()
     } else if (observedMaxMemory > 2048 && m_result.is_64bit) {
         iconName = "status-bad";
         m_labelMaxMemIcon->setToolTip(
-            tr("Your maximum memory allocation exceeds selected java possible memory(due to x86 application limitations)."));
+            tr("Because you're using 32 bit Java, you're exceeding the maximum possible allocation."));
     } else {
         iconName = "status-good";
         m_labelMaxMemIcon->setToolTip("");