diff --git a/api/logic/minecraft/OneSixVersionFormat.cpp b/api/logic/minecraft/OneSixVersionFormat.cpp
index d6aaa790c..0329d70ef 100644
--- a/api/logic/minecraft/OneSixVersionFormat.cpp
+++ b/api/logic/minecraft/OneSixVersionFormat.cpp
@@ -194,8 +194,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
             LibDLInfo->artifact = out->mojangDownloads["client"];
             lib->setMojangDownloadInfo(LibDLInfo);
         }
-        // we got nothing... guess based on ancient hardcoded Mojang behaviour
-        // FIXME: this will eventually break...
+        // we got nothing...
         else
         {
             out->addProblem(
diff --git a/application/pages/instance/VersionPage.cpp b/application/pages/instance/VersionPage.cpp
index eff12c9ca..a98bfb7da 100644
--- a/application/pages/instance/VersionPage.cpp
+++ b/application/pages/instance/VersionPage.cpp
@@ -212,12 +212,16 @@ void VersionPage::updateVersionControls()
 {
     // FIXME: this is a dirty hack
     auto minecraftVersion = Version(m_profile->getComponentVersion("net.minecraft"));
-    bool newCraft = minecraftVersion >= Version("1.14");
-    bool oldCraft = minecraftVersion <= Version("1.12.2");
-    ui->actionInstall_Fabric->setEnabled(controlsEnabled && newCraft);
-    ui->actionInstall_Forge->setEnabled(controlsEnabled);
-    ui->actionInstall_LiteLoader->setEnabled(controlsEnabled && oldCraft);
-    ui->actionReload->setEnabled(true);
+
+    bool supportsFabric = minecraftVersion >= Version("1.14");
+    ui->actionInstall_Fabric->setEnabled(controlsEnabled && supportsFabric);
+
+    bool supportsForge = minecraftVersion <= Version("1.16.5");
+    ui->actionInstall_Forge->setEnabled(controlsEnabled && supportsForge);
+
+    bool supportsLiteLoader = minecraftVersion <= Version("1.12.2");
+    ui->actionInstall_LiteLoader->setEnabled(controlsEnabled && supportsLiteLoader);
+
     updateButtons();
 }