diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake
index 5ec3041134..4b4face4d7 100644
--- a/CMake/ScmRevGen.cmake
+++ b/CMake/ScmRevGen.cmake
@@ -7,7 +7,7 @@ if(GIT_FOUND)
       OUTPUT_VARIABLE DOLPHIN_WC_REVISION
       OUTPUT_STRIP_TRAILING_WHITESPACE)
   # defines DOLPHIN_WC_DESCRIBE
-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
       OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js
index afe081df80..010aece661 100644
--- a/Source/Core/Common/make_scmrev.h.js
+++ b/Source/Core/Common/make_scmrev.h.js
@@ -3,7 +3,7 @@ var oFS				= new ActiveXObject("Scripting.FileSystemObject");
 
 var outfile			= "./scmrev.h";
 var cmd_revision	= " rev-parse HEAD";
-var cmd_describe	= " describe --always --long --dirty";
+var cmd_describe	= " rev-parse --short HEAD";
 var cmd_branch		= " rev-parse --abbrev-ref HEAD";
 var cmd_commits_ahead = " rev-list --count HEAD ^master";
 
diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
index 6324bf89e1..dc03a095a3 100644
--- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
@@ -231,6 +231,9 @@ void GeneralPane::CreateCheats()
   code_handler_layout->addRow(code_handler_label, m_combobox_codehandler);
 
   cheats_group_layout->addLayout(code_handler_layout);
+
+  code_handler_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
+  code_handler_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
 }
 
 void GeneralPane::LoadConfig()
diff --git a/Source/Core/DolphinQt/Settings/InterfacePane.cpp b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
index 8ca4b8925b..4971192962 100644
--- a/Source/Core/DolphinQt/Settings/InterfacePane.cpp
+++ b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
@@ -131,7 +131,6 @@ void InterfacePane::CreateUI()
     const QString qt_name = QString::fromStdString(PathToFileName(path));
     m_combobox_theme->addItem(qt_name);
   }
-#ifdef _WIN32
   // User Style Combobox
   m_combobox_userstyle = new QComboBox;
   m_label_userstyle = new QLabel(tr("Style:"));
@@ -140,18 +139,19 @@ void InterfacePane::CreateUI()
 
   auto current = QOperatingSystemVersionBase::current();
 
+#ifdef _WIN32
   if (current <= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10))
   {
     m_combobox_userstyle->addItem(tr("Windows 11"), static_cast<int>(Settings::StyleType::Light));
     m_combobox_userstyle->addItem(tr("Windows 10"), static_cast<int>(Settings::StyleType::Dark));
   }
+#endif
 
   for (const std::string& path : userstyle_search_results)
   {
     const QFileInfo file_info(QString::fromStdString(path));
     m_combobox_userstyle->addItem(file_info.completeBaseName(), file_info.fileName());
   }
-#endif
 
   // Checkboxes
   m_checkbox_use_builtin_title_database = new QCheckBox(tr("Use Built-In Database of Game Names"));
diff --git a/Source/Core/UICommon/AutoUpdate.cpp b/Source/Core/UICommon/AutoUpdate.cpp
index a45434e0de..c0f3acb66e 100644
--- a/Source/Core/UICommon/AutoUpdate.cpp
+++ b/Source/Core/UICommon/AutoUpdate.cpp
@@ -29,10 +29,6 @@
 #include <sys/stat.h>
 #endif
 
-#if defined(_WIN32) || defined(__APPLE__)
-#define OS_SUPPORTS_UPDATER
-#endif
-
 // Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process
 
 namespace
@@ -81,14 +77,6 @@ std::string MakeUpdaterCommandLine(const std::map<std::string, std::string>& fla
   return cmdline;
 }
 
-#ifdef __APPLE__
-void CleanupFromPreviousUpdate()
-{
-  // Remove the relocated updater file.
-  File::DeleteDirRecursively(UpdaterPath(true));
-}
-#endif
-
 #endif
 
 // This ignores i18n because most of the text in there (change descriptions) is only going to be
@@ -186,10 +174,6 @@ void AutoUpdateChecker::CheckForUpdate(std::string_view update_track,
   if (!SystemSupportsAutoUpdates() || update_track.empty())
     return;
 
-#ifdef __APPLE__
-  CleanupFromPreviousUpdate();
-#endif
-
   std::string_view version_hash = hash_override.empty() ? Common::GetScmRevGitStr() : hash_override;
   std::string url = fmt::format("{}/update/check/v1/{}/{}/{}", GetUpdateServerUrl(), update_track,
                                 version_hash, GetPlatformID());