diff --git a/src/frontend/EmuThread.cpp b/src/frontend/EmuThread.cpp
index 4c7d0892..9dc6f3f4 100644
--- a/src/frontend/EmuThread.cpp
+++ b/src/frontend/EmuThread.cpp
@@ -1,6 +1,5 @@
 #include <Core.hpp>
 #include <EmuThread.hpp>
-#include <SDL3/SDL.h>
 
 EmuThread::EmuThread(const std::shared_ptr<n64::Core> &core, RenderWidget &renderWidget,
                      SettingsWindow &settings) noexcept : renderWidget(renderWidget), core(core), settings(settings) {}
@@ -36,7 +35,7 @@ void EmuThread::TogglePause() const noexcept {
                                   core->cpu->GetMem().mmio.si.pif.movie.GetFilename());
 }
 
-void EmuThread::SetRender(bool v) const noexcept { core->render = v; }
+void EmuThread::SetRender(const bool v) const noexcept { core->render = v; }
 
 void EmuThread::Reset() const noexcept {
   core->pause = true;
diff --git a/src/frontend/InputSettings.cpp b/src/frontend/InputSettings.cpp
index 34b88922..a01a1ee5 100644
--- a/src/frontend/InputSettings.cpp
+++ b/src/frontend/InputSettings.cpp
@@ -1,25 +1,25 @@
 #include <InputSettings.hpp>
 #include <log.hpp>
 
-InputSettings::InputSettings(nlohmann::json &settings) : settings(settings), QWidget(nullptr) {
-  n64_button_labels[0]  = std::make_unique<QLabel>("A");
-  n64_button_labels[1]  = std::make_unique<QLabel>("B");
-  n64_button_labels[2]  = std::make_unique<QLabel>("Z");
-  n64_button_labels[3]  = std::make_unique<QLabel>("Start");
-  n64_button_labels[4]  = std::make_unique<QLabel>("L");
-  n64_button_labels[5]  = std::make_unique<QLabel>("R");
-  n64_button_labels[6]  = std::make_unique<QLabel>("Dpad Up");
-  n64_button_labels[7]  = std::make_unique<QLabel>("Dpad Down");
-  n64_button_labels[8]  = std::make_unique<QLabel>("Dpad Left");
-  n64_button_labels[9]  = std::make_unique<QLabel>("Dpad Right");
-  n64_button_labels[10] = std::make_unique<QLabel>("C Up");
-  n64_button_labels[11] = std::make_unique<QLabel>("C Down");
-  n64_button_labels[12] = std::make_unique<QLabel>("C Left");
-  n64_button_labels[13] = std::make_unique<QLabel>("C Right");
-  n64_button_labels[14] = std::make_unique<QLabel>("Analog Up");
-  n64_button_labels[15] = std::make_unique<QLabel>("Analog Down");
-  n64_button_labels[16] = std::make_unique<QLabel>("Analog Left");
-  n64_button_labels[17] = std::make_unique<QLabel>("Analog Right");
+InputSettings::InputSettings(nlohmann::json &settings) : QWidget(nullptr), settings(settings) {
+  buttonLabels[0] = std::make_unique<QLabel>("A");
+  buttonLabels[1] = std::make_unique<QLabel>("B");
+  buttonLabels[2] = std::make_unique<QLabel>("Z");
+  buttonLabels[3] = std::make_unique<QLabel>("Start");
+  buttonLabels[4] = std::make_unique<QLabel>("L");
+  buttonLabels[5] = std::make_unique<QLabel>("R");
+  buttonLabels[6] = std::make_unique<QLabel>("Dpad Up");
+  buttonLabels[7] = std::make_unique<QLabel>("Dpad Down");
+  buttonLabels[8] = std::make_unique<QLabel>("Dpad Left");
+  buttonLabels[9] = std::make_unique<QLabel>("Dpad Right");
+  buttonLabels[10] = std::make_unique<QLabel>("C Up");
+  buttonLabels[11] = std::make_unique<QLabel>("C Down");
+  buttonLabels[12] = std::make_unique<QLabel>("C Left");
+  buttonLabels[13] = std::make_unique<QLabel>("C Right");
+  buttonLabels[14] = std::make_unique<QLabel>("Analog Up");
+  buttonLabels[15] = std::make_unique<QLabel>("Analog Down");
+  buttonLabels[16] = std::make_unique<QLabel>("Analog Left");
+  buttonLabels[17] = std::make_unique<QLabel>("Analog Right");
 
   auto str = JSONGetField<std::string>(settings, "input", "A");
   kb_buttons[0] = std::make_unique<QPushButton>(str.c_str());
@@ -135,7 +135,7 @@ void InputSettings::keyPressEvent(QKeyEvent *e) {
   }
 }
 
-std::array<Qt::Key, 18> InputSettings::GetMappedKeys() {
+std::array<Qt::Key, 18> InputSettings::GetMappedKeys() const {
   std::array<Qt::Key, 18> ret{};
 
   for (int i = 0; i < 18; i++) {
diff --git a/src/frontend/InputSettings.hpp b/src/frontend/InputSettings.hpp
index 9a23e6fe..29b76e88 100644
--- a/src/frontend/InputSettings.hpp
+++ b/src/frontend/InputSettings.hpp
@@ -27,7 +27,7 @@ public:
   InputSettings(nlohmann::json &);
   nlohmann::json &settings;
   void keyPressEvent(QKeyEvent *) override;
-  std::array<Qt::Key, 18> GetMappedKeys();
+  std::array<Qt::Key, 18> GetMappedKeys() const;
 Q_SIGNALS:
   void modified();
 };
diff --git a/src/frontend/RenderWidget.hpp b/src/frontend/RenderWidget.hpp
index 969f28d0..1083099e 100644
--- a/src/frontend/RenderWidget.hpp
+++ b/src/frontend/RenderWidget.hpp
@@ -14,13 +14,17 @@ struct QtInstanceFactory : Vulkan::InstanceFactory {
   VkInstance create_instance(const VkInstanceCreateInfo *info) override {
     handle.setApiVersion({1, 3, 0});
     QByteArrayList exts;
+    exts.resize(info->enabledExtensionCount);
     for (int i = 0; i < info->enabledExtensionCount; i++) {
-      exts.push_back(QByteArray::fromStdString(info->ppEnabledExtensionNames[i]));
+      exts[i] = info->ppEnabledExtensionNames[i];
     }
+
     QByteArrayList layers;
+    layers.resize(info->enabledExtensionCount);
     for (int i = 0; i < info->enabledLayerCount; i++) {
-      layers.push_back(QByteArray::fromStdString(info->ppEnabledLayerNames[i]));
+      layers[i] = info->ppEnabledLayerNames[i];
     }
+
     handle.setExtensions(exts);
     handle.setLayers(layers);
     handle.setApiVersion({1, 3, 0});
@@ -49,9 +53,11 @@ public:
 
   std::vector<const char *> get_instance_extensions() override {
     auto vec = std::vector<const char *>();
+    const auto &extensions = window->vulkanInstance()->supportedExtensions();
+    vec.reserve(extensions.size());
 
-    for (const auto &ext : window->vulkanInstance()->supportedExtensions()) {
-      vec.push_back(ext.name);
+    for (const auto &ext : extensions) {
+      vec.emplace_back(ext.name);
     }
 
     return vec;