diff --git a/AerofoilAndroid/app/jni/main/GpSystemServices_Android.cpp b/AerofoilAndroid/app/jni/main/GpSystemServices_Android.cpp
index 2d20739..1137dcd 100644
--- a/AerofoilAndroid/app/jni/main/GpSystemServices_Android.cpp
+++ b/AerofoilAndroid/app/jni/main/GpSystemServices_Android.cpp
@@ -97,7 +97,7 @@ GpOperatingSystem_t GpSystemServices_Android::GetOperatingSystem() const
 
 GpOperatingSystemFlavor_t GpSystemServices_Android::GetOperatingSystemFlavor() const
 {
-	return GpOperatingSystems::kGeneric;
+	return GpOperatingSystemFlavors::kGeneric;
 }
 
 unsigned int GpSystemServices_Android::GetCPUCount() const
diff --git a/AerofoilWeb/GpSystemServices_Web.cpp b/AerofoilWeb/GpSystemServices_Web.cpp
index 6acbc8f..bb004a7 100644
--- a/AerofoilWeb/GpSystemServices_Web.cpp
+++ b/AerofoilWeb/GpSystemServices_Web.cpp
@@ -178,7 +178,7 @@ GpOperatingSystem_t GpSystemServices_Web::GetOperatingSystem() const
 
 GpOperatingSystemFlavor_t GpSystemServices_Web::GetOperatingSystemFlavor() const
 {
-	return GpOperatingSystems::kGeneric;
+	return GpOperatingSystemFlavors::kGeneric;
 }
 
 unsigned int GpSystemServices_Web::GetCPUCount() const
diff --git a/AerofoilWeb/GpSystemServices_Web.h b/AerofoilWeb/GpSystemServices_Web.h
index 03fb41f..8b29cb1 100644
--- a/AerofoilWeb/GpSystemServices_Web.h
+++ b/AerofoilWeb/GpSystemServices_Web.h
@@ -19,8 +19,8 @@ public:
 	bool IsFullscreenPreferred() const override;
 	bool IsFullscreenOnStartup() const override;
 	bool HasNativeFileManager() const override;
-	GpOperatingSystem_t GetOperatingSystem() const;
-	GpOperatingSystemFlavor_t GetOperatingSystemFlavor() const;
+	GpOperatingSystem_t GetOperatingSystem() const override;
+	GpOperatingSystemFlavor_t GetOperatingSystemFlavor() const override;
 	unsigned int GetCPUCount() const override;
 	void SetTextInputEnabled(bool isEnabled) override;
 	bool IsTextInputEnabled() const override;
diff --git a/AerofoilX/GpSystemServices_X.cpp b/AerofoilX/GpSystemServices_X.cpp
index 98ebaed..7b5a05f 100644
--- a/AerofoilX/GpSystemServices_X.cpp
+++ b/AerofoilX/GpSystemServices_X.cpp
@@ -106,7 +106,7 @@ GpOperatingSystem_t GpSystemServices_X::GetOperatingSystem() const
 
 GpOperatingSystemFlavor_t GpSystemServices_X::GetOperatingSystemFlavor() const
 {
-	return GpOperatingSystems::kGeneric;
+	return GpOperatingSystemFlavors::kGeneric;
 }
 
 unsigned int GpSystemServices_X::GetCPUCount() const
diff --git a/PortabilityLayer/FileManager.cpp b/PortabilityLayer/FileManager.cpp
index 3f869ab..303d041 100644
--- a/PortabilityLayer/FileManager.cpp
+++ b/PortabilityLayer/FileManager.cpp
@@ -513,9 +513,9 @@ namespace PortabilityLayer
 	}
 
 #if GP_ASYNCIFY_PARANOID
-	bool FileManager::PromptSaveFile(VirtualDirectory_t dirID, const char *extension, char *path, size_t &outPathLength, size_t pathCapacity, bool &outDeletedAny, const PLPasStr &initialFileName, const PLPasStr &promptText, bool composites, const FileBrowserUI_DetailsCallbackAPI &callbackAPI)
+	bool FileManager::PromptSaveFile(VirtualDirectory_t dirID, const char *extension, char *path, size_t &outPathLength, size_t pathCapacity, const PLPasStr &initialFileName, const PLPasStr &promptText, bool composites, const FileBrowserUI_DetailsCallbackAPI &callbackAPI)
 	{
-		return static_cast<FileManagerImpl*>(this)->PromptSaveFile(dirID, extension, path, outPathLength, pathCapacity, outDeletedAny, initialFileName, promptText, composites, callbackAPI);
+		return static_cast<FileManagerImpl*>(this)->PromptSaveFile(dirID, extension, path, outPathLength, pathCapacity, initialFileName, promptText, composites, callbackAPI);
 	}
 
 	bool FileManager::PromptOpenFile(VirtualDirectory_t dirID, const char *extension, char *path, size_t &outPathLength, size_t pathCapacity, const PLPasStr &promptText, bool composites, const FileBrowserUI_DetailsCallbackAPI &callbackAPI)