diff --git a/ErsatzTV.Core/Interfaces/Scheduling/IMultiEpisodeShuffleCollectionEnumeratorFactory.cs b/ErsatzTV.Core/Interfaces/Scheduling/IMultiEpisodeShuffleCollectionEnumeratorFactory.cs
index a5d301f8..ad649227 100644
--- a/ErsatzTV.Core/Interfaces/Scheduling/IMultiEpisodeShuffleCollectionEnumeratorFactory.cs
+++ b/ErsatzTV.Core/Interfaces/Scheduling/IMultiEpisodeShuffleCollectionEnumeratorFactory.cs
@@ -5,7 +5,7 @@ namespace ErsatzTV.Core.Interfaces.Scheduling;
 public interface IMultiEpisodeShuffleCollectionEnumeratorFactory
 {
     IMediaCollectionEnumerator Create(
-        string luaTemplatePath,
+        string luaScriptPath,
         IList<MediaItem> mediaItems,
         CollectionEnumeratorState state);
 }
diff --git a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
index cc5ea5bc..74b81d55 100644
--- a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
+++ b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
@@ -765,18 +765,18 @@ public class PlayoutBuilder : IPlayoutBuilder
                 {
                     foreach (MetadataGuid guid in show.ShowMetadata.Map(sm => sm.Guids).Flatten())
                     {
-                        string luaTemplatePath = Path.ChangeExtension(
+                        string luaScriptPath = Path.ChangeExtension(
                             Path.Combine(
                                 FileSystemLayout.MultiEpisodeShuffleTemplatesFolder,
                                 guid.Guid.Replace("://", "_")),
                             "lua");
-                        _logger.LogDebug("Checking for lua template at {Path}", luaTemplatePath);
-                        if (_localFileSystem.FileExists(luaTemplatePath))
+                        _logger.LogDebug("Checking for lua script at {Path}", luaScriptPath);
+                        if (_localFileSystem.FileExists(luaScriptPath))
                         {
-                            _logger.LogDebug("Found lua template at {Path}", luaTemplatePath);
+                            _logger.LogDebug("Found lua script at {Path}", luaScriptPath);
                             try
                             {
-                                return _multiEpisodeFactory.Create(luaTemplatePath, mediaItems, state);
+                                return _multiEpisodeFactory.Create(luaScriptPath, mediaItems, state);
                             }
                             catch (Exception ex)
                             {
diff --git a/ErsatzTV.Infrastructure/FFmpeg/MusicVideoCreditsGenerator.cs b/ErsatzTV.Infrastructure/FFmpeg/MusicVideoCreditsGenerator.cs
index 2313f351..45f8ed67 100644
--- a/ErsatzTV.Infrastructure/FFmpeg/MusicVideoCreditsGenerator.cs
+++ b/ErsatzTV.Infrastructure/FFmpeg/MusicVideoCreditsGenerator.cs
@@ -121,7 +121,7 @@ public class MusicVideoCreditsGenerator : IMusicVideoCreditsGenerator
                         AllArtists = (metadata.Artists ?? new List<MusicVideoArtist>()).Map(a => a.Name),
                         Artist = artist,
                         musicVideo.GetHeadVersion().Duration,
-                        settings.StreamSeek
+                        StreamSeek = await settings.StreamSeek.IfNoneAsync(TimeSpan.Zero)
                     });
 
                 string fileName = _tempFilePool.GetNextTempFile(TempFileCategory.Subtitle);
diff --git a/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumerator.cs b/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumerator.cs
index 8e38e1b2..a3821fcf 100644
--- a/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumerator.cs
+++ b/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumerator.cs
@@ -18,12 +18,12 @@ public class MultiEpisodeShuffleCollectionEnumerator : IMediaCollectionEnumerato
     public MultiEpisodeShuffleCollectionEnumerator(
         IList<MediaItem> mediaItems,
         CollectionEnumeratorState state,
-        string templateFile,
+        string scriptFile,
         ILogger logger)
     {
         _logger = logger;
         using var lua = new Lua();
-        lua.DoFile(templateFile);
+        lua.DoFile(scriptFile);
 
         var numGroups = (int)(double)lua["numParts"];
         
diff --git a/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumeratorFactory.cs b/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumeratorFactory.cs
index 8bb176ba..b1cda998 100644
--- a/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumeratorFactory.cs
+++ b/ErsatzTV.Infrastructure/Scheduling/MultiEpisodeShuffleCollectionEnumeratorFactory.cs
@@ -16,8 +16,8 @@ public class MultiEpisodeShuffleCollectionEnumeratorFactory
     }
 
     public IMediaCollectionEnumerator Create(
-        string luaTemplatePath,
+        string luaScriptPath,
         IList<MediaItem> mediaItems,
         CollectionEnumeratorState state) =>
-        new MultiEpisodeShuffleCollectionEnumerator(mediaItems, state, luaTemplatePath, _logger);
+        new MultiEpisodeShuffleCollectionEnumerator(mediaItems, state, luaScriptPath, _logger);
 }