diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd92d02f8..85cf08f24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Fixed
+- Fix error loading path replacements when using MySql
+- Fix tray icon shortcut to open logs folder on Windows
 
 ## [0.8.4-beta] - 2023-12-02
 ### Fixed
@@ -11,7 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Properly validate filler preset mode pad to require `filler pad to nearest minute` value
 - Fix bug where previously-synchronized collection tags would disappear
   - This bug affected Jellyfin, Emby and Plex collections
-- Fix detection of AMF hardware acceleration on Windows 
+- Fix detection of AMF hardware acceleration on Windows
 
 ## [0.8.3-beta] - 2023-11-22
 ### Added
diff --git a/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor b/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor
index 8eceb95a8..cc11d0d9d 100644
--- a/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor
+++ b/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor
@@ -8,7 +8,7 @@
 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
     <MudTable Hover="true" Items="_pathReplacements.OrderBy(r => r.Id)" Dense="true" @bind-SelectedItem="_selectedItem">
         <ToolBarContent>
-            <MudText Typo="Typo.h6"><b>@_source.Name</b> Path Replacements</MudText>
+            <MudText Typo="Typo.h6"><b>@_source?.Name</b> Path Replacements</MudText>
         </ToolBarContent>
         <ColGroup>
             <col/>
@@ -87,7 +87,7 @@
     public Func<List<RemoteMediaSourcePathReplacementEditViewModel>, IRequest<Either<BaseError, Unit>>> GetUpdatePathReplacementsRequest { get; set; }
 
     private RemoteMediaSourceViewModel _source;
-    private List<RemoteMediaSourcePathReplacementEditViewModel> _pathReplacements;
+    private List<RemoteMediaSourcePathReplacementEditViewModel> _pathReplacements = new();
 
     private RemoteMediaSourcePathReplacementEditViewModel _selectedItem;