diff --git a/src/citron/configuration/configure_per_game.cpp b/src/citron/configuration/configure_per_game.cpp
index 4d0585d2c..6ee4fa204 100644
--- a/src/citron/configuration/configure_per_game.cpp
+++ b/src/citron/configuration/configure_per_game.cpp
@@ -61,7 +61,7 @@
 #include "common/string_util.h"
 #include "common/xci_trimmer.h"
 
-ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name,
+ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name_,
                                    std::vector<VkDeviceInfo::Record>& vk_device_records,
                                    Core::System& system_)
 : QDialog(parent),
diff --git a/src/citron/configuration/configure_per_game.h b/src/citron/configuration/configure_per_game.h
index c2dee1eb5..c71cdeef3 100644
--- a/src/citron/configuration/configure_per_game.h
+++ b/src/citron/configuration/configure_per_game.h
@@ -52,7 +52,7 @@ class ConfigurePerGame : public QDialog {
 
 public:
     // Cannot use std::filesystem::path due to https://bugreports.qt.io/browse/QTBUG-73263
-    explicit ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name,
+    explicit ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name_,
                               std::vector<VkDeviceInfo::Record>& vk_device_records,
                               Core::System& system_);
     ~ConfigurePerGame() override;
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index 469cd91f9..924958882 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -179,7 +179,13 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
     }
     std::sort(patch_dirs.begin(), patch_dirs.end(),
               [](const VirtualDir& l, const VirtualDir& r) {
-                  if(!l) return true; if(!r) return false; return l->GetName() < r->GetName();
+                  if (!l) {
+                      return true;
+                  }
+                  if (!r) {
+                      return false;
+                  }
+                  return l->GetName() < r->GetName();
               });
 
     std::vector<VirtualDir> layers;
diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp
index 174548621..b14b52c28 100644
--- a/src/core/file_sys/savedata_factory.cpp
+++ b/src/core/file_sys/savedata_factory.cpp
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <chrono>
@@ -247,7 +248,7 @@ Result SaveDataFactory::ReadSaveDataExtraData(SaveDataExtraData* out_extra_data,
                   save_directory);
 
         // Return zeroed data
-        std::memset(out_extra_data, 0, sizeof(SaveDataExtraData));
+        *out_extra_data = {}; // Or: *out_extra_data = SaveDataExtraData{};
         out_extra_data->attr = attribute;
         return ResultSuccess;
     }