diff --git a/Source/Core/DolphinTool/ConvertCommand.cpp b/Source/Core/DolphinTool/ConvertCommand.cpp
index 863cd4b70b..210e608d2a 100644
--- a/Source/Core/DolphinTool/ConvertCommand.cpp
+++ b/Source/Core/DolphinTool/ConvertCommand.cpp
@@ -156,7 +156,7 @@ int ConvertCommand(const std::vector<std::string>& args)
   const bool scrub = static_cast<bool>(options.get("scrub"));
 
   // Open the volume
-  std::unique_ptr<DiscIO::Volume> volume = DiscIO::CreateDisc(input_file_path);
+  const std::unique_ptr<DiscIO::Volume> volume = DiscIO::CreateDisc(input_file_path);
   if (!volume)
   {
     if (scrub)
@@ -249,7 +249,7 @@ int ConvertCommand(const std::vector<std::string>& args)
   }
 
   // --compress, --compress_level
-  std::optional<DiscIO::WIARVZCompressionType> compression_o =
+  const std::optional<DiscIO::WIARVZCompressionType> compression_o =
       ParseCompressionTypeString(options["compression"]);
 
   std::optional<int> compression_level_o;
diff --git a/Source/Core/DolphinTool/ExtractCommand.cpp b/Source/Core/DolphinTool/ExtractCommand.cpp
index 32d2a49d86..28c99253a4 100644
--- a/Source/Core/DolphinTool/ExtractCommand.cpp
+++ b/Source/Core/DolphinTool/ExtractCommand.cpp
@@ -187,7 +187,8 @@ static bool HandleExtractPartition(const std::string& output, const std::string&
     return true;
   }
 
-  if (auto file_info = GetFileInfo(disc_volume, partition, single_file_path); file_info != nullptr)
+  const auto file_info = GetFileInfo(disc_volume, partition, single_file_path);
+  if (file_info != nullptr)
   {
     file.append("files/").append(single_file_path);
     File::CreateFullPath(file);