diff --git a/Source/Common/Config.cpp b/Source/Common/Config.cpp
index 741936449..9062990b6 100644
--- a/Source/Common/Config.cpp
+++ b/Source/Common/Config.cpp
@@ -356,7 +356,7 @@ fextl::unique_ptr<FEXCore::Config::Layer> CreateMainLayer(const fextl::string* F
 }
 
 fextl::unique_ptr<FEXCore::Config::Layer> CreateUserOverrideLayer(std::string_view AppConfig, std::optional<fextl::string> AppName) {
-  return fextl::make_unique<MainLoader>(FEXCore::Config::LayerType::LAYER_USER_OVERRIDE, AppConfig, AppName);
+  return fextl::make_unique<MainLoader>(FEXCore::Config::LayerType::LAYER_USER_OVERRIDE, AppConfig, std::move(AppName));
 }
 
 fextl::unique_ptr<FEXCore::Config::Layer> CreateAppLayer(const fextl::string& Filename, FEXCore::Config::LayerType Type) {
diff --git a/Source/Common/Config.h b/Source/Common/Config.h
index f0ee1f35e..6834ca8f9 100644
--- a/Source/Common/Config.h
+++ b/Source/Common/Config.h
@@ -59,7 +59,7 @@ void LoadConfig(fextl::string ProgramName = {}, char** const envp = nullptr, con
 
 fextl::string GetHomeDirectory();
 
-fextl::string GetDataDirectory(const PortableInformation& PortableInfo);
+fextl::string GetDataDirectory(bool Global, const PortableInformation& PortableInfo);
 fextl::string GetConfigDirectory(bool Global, const PortableInformation& PortableInfo);
 fextl::string GetConfigFileLocation(bool Global, const PortableInformation& PortableInfo);
 fextl::string GetCacheDirectory();
@@ -82,7 +82,7 @@ fextl::unique_ptr<FEXCore::Config::Layer> CreateGlobalMainLayer();
  * @return unique_ptr for that layer
  */
 fextl::unique_ptr<FEXCore::Config::Layer> CreateMainLayer(const fextl::string* File = nullptr, std::optional<fextl::string> AppName = std::nullopt);
-fextl::unique_ptr<FEXCore::Config::Layer> CreateUserOverrideLayer(std::string_view AppConfig);
+fextl::unique_ptr<FEXCore::Config::Layer> CreateUserOverrideLayer(std::string_view AppConfig, std::optional<fextl::string> AppName);
 
 /**
  * @brief Create an application configuration loader