diff --git a/Source/OxyPlot.Maui.Skia/Platforms/MacCatalyst/MauiFontLoader.cs b/Source/OxyPlot.Maui.Skia/Platforms/MacCatalyst/MauiFontLoader.cs
index 3928329..1931d5f 100644
--- a/Source/OxyPlot.Maui.Skia/Platforms/MacCatalyst/MauiFontLoader.cs
+++ b/Source/OxyPlot.Maui.Skia/Platforms/MacCatalyst/MauiFontLoader.cs
@@ -12,11 +12,11 @@ public Stream Load(string fontName)
         if (fontRegistrar == null)
             fontRegistrar = IPlatformApplication.Current.Services.GetRequiredService<IFontRegistrar>();
 
-        fontName = fontRegistrar.GetFont(fontName);
-        if (File.Exists(fontName))
-        {
+        fontName = fontRegistrar.GetFont(fontName) ?? fontName;
+        if (fontName == null)
+            return null;
+        else if (File.Exists(fontName))
             return File.OpenRead(fontName);
-        }
 
         try
         {
diff --git a/Source/OxyPlot.Maui.Skia/Platforms/iOS/MauiFontLoader.cs b/Source/OxyPlot.Maui.Skia/Platforms/iOS/MauiFontLoader.cs
index a7321aa..70e9bba 100644
--- a/Source/OxyPlot.Maui.Skia/Platforms/iOS/MauiFontLoader.cs
+++ b/Source/OxyPlot.Maui.Skia/Platforms/iOS/MauiFontLoader.cs
@@ -12,11 +12,11 @@ public Stream Load(string fontName)
         if (fontRegistrar == null)
             fontRegistrar = IPlatformApplication.Current.Services.GetRequiredService<IFontRegistrar>();
 
-        fontName = fontRegistrar.GetFont(fontName);
-        if (File.Exists(fontName))
-        {
+        fontName = fontRegistrar.GetFont(fontName) ?? fontName;
+        if (fontName == null)
+            return null;
+        else if (File.Exists(fontName))
             return File.OpenRead(fontName);
-        }
 
         try
         {
diff --git a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj
index c3649bb..7cd2720 100644
--- a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj
+++ b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj
@@ -13,10 +13,10 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<!-- Display name -->
-		<ApplicationTitle>OxyplotMauiSimple</ApplicationTitle>
+		<ApplicationTitle>OxyplotMauiSample</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.oxyplotmauisimple</ApplicationId>
+		<ApplicationId>com.companyname.oxyplotmauisample</ApplicationId>
 		<ApplicationIdGuid>2C1CD083-05E3-4080-840A-EC3B8334CCD7</ApplicationIdGuid>
 
 		<!-- Versions -->
@@ -62,7 +62,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="OxyPlot.ExampleLibrary" Version="2.2.0" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.40" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Source/OxyplotMauiSample/Platforms/Tizen/tizen-manifest.xml b/Source/OxyplotMauiSample/Platforms/Tizen/tizen-manifest.xml
index 1c43010..e7a67f1 100644
--- a/Source/OxyplotMauiSample/Platforms/Tizen/tizen-manifest.xml
+++ b/Source/OxyplotMauiSample/Platforms/Tizen/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="maui-application-id-placeholder" version="0.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
   <profile name="common" />
-  <ui-application appid="maui-application-id-placeholder" exec="OxyplotMauiSimple.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
+  <ui-application appid="maui-application-id-placeholder" exec="OxyplotMauiSample.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
     <label>maui-application-title-placeholder</label>
     <icon>maui-appicon-placeholder</icon>
     <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
diff --git a/Source/OxyplotMauiSample/Platforms/Windows/app.manifest b/Source/OxyplotMauiSample/Platforms/Windows/app.manifest
index cccce6a..1664b44 100644
--- a/Source/OxyplotMauiSample/Platforms/Windows/app.manifest
+++ b/Source/OxyplotMauiSample/Platforms/Windows/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="OxyplotMauiSimple.WinUI.app"/>
+  <assemblyIdentity version="1.0.0.0" name="OxyplotMauiSample.WinUI.app"/>
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>