diff --git a/Core/EmuSettings.cpp b/Core/EmuSettings.cpp
index 83b1f43..39e74db 100644
--- a/Core/EmuSettings.cpp
+++ b/Core/EmuSettings.cpp
@@ -126,7 +126,8 @@ void EmuSettings::SetPreferences(PreferencesConfig config)
 	FolderUtilities::SetFolderOverrides(
 		_saveFolder,
 		_saveStateFolder,
-		_screenshotFolder
+		_screenshotFolder,
+		""
 	);
 
 	_preferences = config;
diff --git a/Libretro/LibretroSoundManager.h b/Libretro/LibretroSoundManager.h
index f0cfee1..269c887 100644
--- a/Libretro/LibretroSoundManager.h
+++ b/Libretro/LibretroSoundManager.h
@@ -27,7 +27,7 @@ public:
 	{
 		if(!_skipMode && _sendAudioSample) {
 			for(uint32_t total = 0; total < sampleCount; ) {
-				total += _sendAudioSample(soundBuffer + total*2, sampleCount - total);
+				total += (uint32_t)_sendAudioSample(soundBuffer + total*2, (size_t)(sampleCount - total));
 			}
 		}
 	}
diff --git a/Libretro/libretro.cpp b/Libretro/libretro.cpp
index afdee07..2f0b898 100644
--- a/Libretro/libretro.cpp
+++ b/Libretro/libretro.cpp
@@ -572,7 +572,7 @@ extern "C" {
 		//Expect the following structure:
 		// /saves/*.sav
 		FolderUtilities::SetHomeFolder(systemFolder);
-		FolderUtilities::SetFolderOverrides(saveFolder, "", "");
+		FolderUtilities::SetFolderOverrides(saveFolder, "", "", systemFolder);
 
 		update_settings();
 
diff --git a/Utilities/FolderUtilities.cpp b/Utilities/FolderUtilities.cpp
index f9765ea..6175042 100644
--- a/Utilities/FolderUtilities.cpp
+++ b/Utilities/FolderUtilities.cpp
@@ -57,11 +57,12 @@ vector<string> FolderUtilities::GetKnownGameFolders()
 	return _gameFolders;
 }
 
-void FolderUtilities::SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder)
+void FolderUtilities::SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder, string firmwareFolder)
 {
 	_saveFolderOverride = saveFolder;
 	_saveStateFolderOverride = saveStateFolder;
 	_screenshotFolderOverride = screenshotFolder;
+	_firmwareFolderOverride = firmwareFolder;
 }
 
 string FolderUtilities::GetSaveFolder()
diff --git a/Utilities/FolderUtilities.h b/Utilities/FolderUtilities.h
index 18dd6d4..a281104 100644
--- a/Utilities/FolderUtilities.h
+++ b/Utilities/FolderUtilities.h
@@ -17,7 +17,7 @@ public:
 	static void SetHomeFolder(string homeFolder);
 	static string GetHomeFolder();
 
-	static void SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder);
+	static void SetFolderOverrides(string saveFolder, string saveStateFolder, string screenshotFolder, string firmwareFolder);
 
 	static void AddKnownGameFolder(string gameFolder);
 	static vector<string> GetKnownGameFolders();