diff --git a/src/NewsReader/NewsReader.Presentation/App.xaml.cs b/src/NewsReader/NewsReader.Presentation/App.xaml.cs
index fa45ef2a..654ad8ae 100644
--- a/src/NewsReader/NewsReader.Presentation/App.xaml.cs
+++ b/src/NewsReader/NewsReader.Presentation/App.xaml.cs
@@ -39,17 +39,18 @@ public App(ISettingsService settingsService, IAppInfoService appInfoService, Laz
 
         InitializeComponent();
         this.appController = appController.Value;
-        MainPage = (Page)this.appController.MainView;
     }
 
     public static string LogFileName { get; } = Path.Combine(FileSystem.CacheDirectory, "Logging", "AppLog.txt");
 
     protected override Window CreateWindow(IActivationState? activationState)
     {
-        var window = base.CreateWindow(activationState);
-        window.Title = AppInfo.Name;
-        window.MinimumWidth = 300;
-        window.MinimumHeight = 400;
+        var window = new Window((Page)appController.MainView)
+        {
+            Title = AppInfo.Name,
+            MinimumWidth = 300,
+            MinimumHeight = 400
+        };
         window.Created += (_, _) => OnCreated();
         window.Deactivated += (_, _) => OnDeactivated();
         window.Stopped += (_, _) => OnStopped();
diff --git a/src/NewsReader/NewsReader.Presentation/GlobalSuppressions.cs b/src/NewsReader/NewsReader.Presentation/GlobalSuppressions.cs
index dcf79252..716f4979 100644
--- a/src/NewsReader/NewsReader.Presentation/GlobalSuppressions.cs
+++ b/src/NewsReader/NewsReader.Presentation/GlobalSuppressions.cs
@@ -10,3 +10,4 @@
 [assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:Waf.NewsReader.Presentation.Services.DataService.Save(System.Object)")]
 [assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:Waf.NewsReader.Presentation.Services.WebStorageService.DownloadFile(System.String)~System.Threading.Tasks.Task{System.ValueTuple{System.IO.Stream,System.String}}")]
 [assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:Waf.NewsReader.Presentation.Services.WebStorageService.UploadFile(System.IO.Stream)~System.Threading.Tasks.Task{System.String}")]
+[assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member", Target = "~M:Waf.NewsReader.Presentation.App.OnDeactivated")]
diff --git a/src/NewsReader/NewsReader.Presentation/Services/DataService.cs b/src/NewsReader/NewsReader.Presentation/Services/DataService.cs
index 821adc37..057598e7 100644
--- a/src/NewsReader/NewsReader.Presentation/Services/DataService.cs
+++ b/src/NewsReader/NewsReader.Presentation/Services/DataService.cs
@@ -16,7 +16,7 @@ public string GetHash()
     {
         using var stream = GetReadStream();
         using var sha1 = SHA1.Create();
-        return BitConverter.ToString(sha1.ComputeHash(stream)).Replace("-", "", StringComparison.Ordinal);
+        return Convert.ToHexString(sha1.ComputeHash(stream));
     }
 
     public async Task<T?> Load<T>(Stream? dataStream = null) where T : class
diff --git a/src/NewsReader/NewsReader.Presentation/Services/MessageService.cs b/src/NewsReader/NewsReader.Presentation/Services/MessageService.cs
index cad7c57f..03bc59f8 100644
--- a/src/NewsReader/NewsReader.Presentation/Services/MessageService.cs
+++ b/src/NewsReader/NewsReader.Presentation/Services/MessageService.cs
@@ -5,7 +5,7 @@ namespace Waf.NewsReader.Presentation.Services;
 
 public class MessageService : IMessageService
 {
-    public Task ShowMessage(string message) => Application.Current!.MainPage!.DisplayAlert(Resources.Info, message, Resources.Ok);
+    public Task ShowMessage(string message) => Application.Current!.Windows[0].Page!.DisplayAlert(Resources.Info, message, Resources.Ok);
 
-    public Task<bool> ShowYesNoQuestion(string message) => Application.Current!.MainPage!.DisplayAlert(Resources.Question, message, Resources.Yes, Resources.No);
+    public Task<bool> ShowYesNoQuestion(string message) => Application.Current!.Windows[0].Page!.DisplayAlert(Resources.Question, message, Resources.Yes, Resources.No);
 }