diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcaa7c5b1..2a89c5451 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 message displayed after building empty playout
+- Fix Emby and Jellyfin links
 
 ## [0.0.52-alpha] - 2021-07-22
 ### Added
diff --git a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
index 98f6fd105..ff058c8dd 100644
--- a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
+++ b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
@@ -403,8 +403,15 @@ namespace ErsatzTV.Core.Scheduling
             // remove any items outside the desired range
             playout.Items.RemoveAll(old => old.FinishOffset < playoutStart || old.StartOffset > playoutFinish);
 
-            DateTimeOffset maxStartTime = playout.Items.Max(i => i.FinishOffset);
-            DateTimeOffset minCurrentTime = maxStartTime < currentTime ? maxStartTime : currentTime;
+            DateTimeOffset minCurrentTime = currentTime;
+            if (playout.Items.Any())
+            {
+                DateTimeOffset maxStartTime = playout.Items.Max(i => i.FinishOffset);
+                if (maxStartTime < currentTime)
+                {
+                    minCurrentTime = maxStartTime;
+                }
+            }
             
             playout.Anchor = new PlayoutAnchor
             {
diff --git a/ErsatzTV/Shared/RemoteMediaSourceEditor.razor b/ErsatzTV/Shared/RemoteMediaSourceEditor.razor
index 41b88b361..5f042fd87 100644
--- a/ErsatzTV/Shared/RemoteMediaSourceEditor.razor
+++ b/ErsatzTV/Shared/RemoteMediaSourceEditor.razor
@@ -54,7 +54,7 @@
         {
             Either<BaseError, Unit> result = await SaveSecrets(_model);
             result.Match(
-                _ => _navigationManager.NavigateTo($"/media/{Name.ToLowerInvariant()}"),
+                _ => _navigationManager.NavigateTo($"/media/sources/{Name.ToLowerInvariant()}"),
                 error =>
                 {
                     _snackbar.Add(error.Value, Severity.Error);
diff --git a/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor b/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor
index 3416b4f13..e0d32f778 100644
--- a/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor
+++ b/ErsatzTV/Shared/RemoteMediaSourcePathReplacementsEditor.razor
@@ -132,7 +132,7 @@
                 _snackbar.Add($"Unexpected error saving path replacements: {error.Value}", Severity.Error);
                 _logger.LogError("Unexpected error saving path replacements: {Error}", error.Value);
             },
-            () => _navigationManager.NavigateTo($"/media/{Name.ToLowerInvariant()}"));
+            () => _navigationManager.NavigateTo($"/media/sources/{Name.ToLowerInvariant()}"));
     }
 
 }
\ No newline at end of file
diff --git a/ErsatzTV/Shared/RemoteMediaSources.razor b/ErsatzTV/Shared/RemoteMediaSources.razor
index cf3e9fb0b..8527c3ca6 100644
--- a/ErsatzTV/Shared/RemoteMediaSources.razor
+++ b/ErsatzTV/Shared/RemoteMediaSources.razor
@@ -60,7 +60,7 @@
     {
         <MudButton Variant="Variant.Filled"
                    Color="Color.Primary"
-                   Link="@($"/media/{Name.ToLowerInvariant()}/edit")"
+                   Link="@($"/media/sources/{Name.ToLowerInvariant()}/edit")"
                    Class="mt-4">
             Connect @Name
         </MudButton>
@@ -70,7 +70,7 @@
     {
         <MudButton Variant="Variant.Filled"
                    Color="Color.Secondary"
-                   Link="@($"/media/{Name.ToLowerInvariant()}/edit")"
+                   Link="@($"/media/sources/{Name.ToLowerInvariant()}/edit")"
                    Class="ml-4 mt-4">
             Fix @Name Connection
         </MudButton>