diff --git a/launcher/NullInstance.h b/launcher/NullInstance.h
index e603b1634..13ad0b2c5 100644
--- a/launcher/NullInstance.h
+++ b/launcher/NullInstance.h
@@ -70,7 +70,7 @@ class NullInstance : public BaseInstance {
         return out;
     }
     QString modsRoot() const override { return QString(); }
-    void updateRuntimeContext()
+    void updateRuntimeContext() override
     {
         // NOOP
     }
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 2d0560049..4f2ee3629 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -501,7 +501,7 @@ QString JavaUtils::getJavaCheckPath()
 QStringList getMinecraftJavaBundle()
 {
     QStringList processpaths;
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
     processpaths << FS::PathCombine(QDir::homePath(), FS::PathCombine("Library", "Application Support", "minecraft", "runtime"));
 #elif defined(Q_OS_WIN32)
 
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index efbc80e76..7749d0f6b 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -105,7 +105,7 @@
 
 #define IBUS "@im=ibus"
 
-static bool switcherooSetupGPU(QProcessEnvironment& env)
+[[maybe_unused]] static bool switcherooSetupGPU(QProcessEnvironment& env)
 {
 #ifdef WITH_QTDBUS
     if (!QDBusConnection::systemBus().isConnected())
diff --git a/launcher/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp
index 19bd5a062..e006a1411 100644
--- a/launcher/tools/MCEditTool.cpp
+++ b/launcher/tools/MCEditTool.cpp
@@ -45,7 +45,7 @@ bool MCEditTool::check(const QString& toolPath, QString& error)
 
 QString MCEditTool::getProgramPath()
 {
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
     return path();
 #else
     const QString mceditPath = path();
diff --git a/launcher/ui/pages/global/ExternalToolsPage.cpp b/launcher/ui/pages/global/ExternalToolsPage.cpp
index 4110bd5ad..470704d29 100644
--- a/launcher/ui/pages/global/ExternalToolsPage.cpp
+++ b/launcher/ui/pages/global/ExternalToolsPage.cpp
@@ -156,7 +156,7 @@ void ExternalToolsPage::on_mceditPathBtn_clicked()
     QString raw_dir = ui->mceditPathEdit->text();
     QString error;
     do {
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
         raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
 #else
         raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Folder"), raw_dir);
diff --git a/launcher/ui/pages/instance/ServerPingTask.cpp b/launcher/ui/pages/instance/ServerPingTask.cpp
index b39f3d117..4a9215ce5 100644
--- a/launcher/ui/pages/instance/ServerPingTask.cpp
+++ b/launcher/ui/pages/instance/ServerPingTask.cpp
@@ -16,7 +16,7 @@ void ServerPingTask::executeTask()
 
     // Resolve the actual IP and port for the server
     McResolver* resolver = new McResolver(nullptr, m_domain, m_port);
-    QObject::connect(resolver, &McResolver::succeeded, this, [this, resolver](QString ip, int port) {
+    QObject::connect(resolver, &McResolver::succeeded, this, [this](QString ip, int port) {
         qDebug() << "Resolved Address for" << m_domain << ": " << ip << ":" << port;
 
         // Now that we have the IP and port, query the server
@@ -30,7 +30,7 @@ void ServerPingTask::executeTask()
         QObject::connect(client, &McClient::failed, this, [this](QString error) { emitFailed(error); });
 
         // Delete McClient object when done
-        QObject::connect(client, &McClient::finished, this, [this, client]() { client->deleteLater(); });
+        QObject::connect(client, &McClient::finished, this, [client]() { client->deleteLater(); });
         client->getStatusData();
     });
     QObject::connect(resolver, &McResolver::failed, this, [this](QString error) { emitFailed(error); });
diff --git a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
index 06836c3c5..f99ac8d65 100644
--- a/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
+++ b/launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
@@ -36,7 +36,7 @@ namespace FTBImportAPP {
 QString getFTBRoot()
 {
     QString partialPath = QDir::homePath();
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
     partialPath = FS::PathCombine(partialPath, "Library/Application Support");
 #endif
     return FS::PathCombine(partialPath, ".ftba");
diff --git a/launcher/updater/MacSparkleUpdater.mm b/launcher/updater/MacSparkleUpdater.mm
index 07862c9a3..c54708ee1 100644
--- a/launcher/updater/MacSparkleUpdater.mm
+++ b/launcher/updater/MacSparkleUpdater.mm
@@ -166,7 +166,7 @@ void MacSparkleUpdater::setAllowedChannels(const QSet<QString>& channels) {
     QString channelsConfig = "";
     // Convert QSet<QString> -> NSSet<NSString>
     NSMutableSet<NSString*>* nsChannels = [NSMutableSet setWithCapacity:channels.count()];
-    for (const QString channel : channels) {
+    for (const QString& channel : channels) {
         [nsChannels addObject:channel.toNSString()];
         channelsConfig += channel + " ";
     }