diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs
index 40bc67c..9b2b7f0 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/AnalyzerHelper.cs
@@ -34,7 +34,7 @@ public class AnalyzerHelper
     /// <param name="mode">Analysis mode.</param>
     /// <returns>Modified Intro Timestamps.</returns>
     public Dictionary<Guid, Segment> AdjustIntroTimes(
-            IReadOnlyCollection<QueuedEpisode> episodes,
+            IReadOnlyList<QueuedEpisode> episodes,
             IReadOnlyDictionary<Guid, Segment> originalIntros,
             AnalysisMode mode)
         {
@@ -76,9 +76,9 @@ public class AnalyzerHelper
         return adjustedIntro;
     }
 
-    private List<ChapterInfo> GetChaptersWithVirtualEnd(QueuedEpisode episode)
+    private static List<ChapterInfo> GetChaptersWithVirtualEnd(QueuedEpisode episode)
     {
-        var chapters = Plugin.Instance?.GetChapters(episode.EpisodeId) ?? new List<ChapterInfo>();
+        var chapters = Plugin.Instance?.GetChapters(episode.EpisodeId) ?? [];
         chapters.Add(new ChapterInfo { StartPositionTicks = TimeSpan.FromSeconds(episode.Duration).Ticks });
         return chapters;
     }
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs
index 1e41211..8027450 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/BlackFrameAnalyzer.cs
@@ -39,8 +39,8 @@ public class BlackFrameAnalyzer : IMediaFileAnalyzer
     }
 
     /// <inheritdoc />
-    public IReadOnlyCollection<QueuedEpisode> AnalyzeMediaFiles(
-        IReadOnlyCollection<QueuedEpisode> analysisQueue,
+    public IReadOnlyList<QueuedEpisode> AnalyzeMediaFiles(
+        IReadOnlyList<QueuedEpisode> analysisQueue,
         AnalysisMode mode,
         CancellationToken cancellationToken)
     {
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs
index 6013760..db23fbe 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChapterAnalyzer.cs
@@ -24,8 +24,8 @@ public class ChapterAnalyzer(ILogger<ChapterAnalyzer> logger) : IMediaFileAnalyz
     private ILogger<ChapterAnalyzer> _logger = logger;
 
     /// <inheritdoc />
-    public IReadOnlyCollection<QueuedEpisode> AnalyzeMediaFiles(
-        IReadOnlyCollection<QueuedEpisode> analysisQueue,
+    public IReadOnlyList<QueuedEpisode> AnalyzeMediaFiles(
+        IReadOnlyList<QueuedEpisode> analysisQueue,
         AnalysisMode mode,
         CancellationToken cancellationToken)
     {
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs
index fefda71..cc4e1a9 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/ChromaprintAnalyzer.cs
@@ -49,8 +49,8 @@ public class ChromaprintAnalyzer : IMediaFileAnalyzer
     }
 
     /// <inheritdoc />
-    public IReadOnlyCollection<QueuedEpisode> AnalyzeMediaFiles(
-        IReadOnlyCollection<QueuedEpisode> analysisQueue,
+    public IReadOnlyList<QueuedEpisode> AnalyzeMediaFiles(
+        IReadOnlyList<QueuedEpisode> analysisQueue,
         AnalysisMode mode,
         CancellationToken cancellationToken)
     {
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs
index 3e24134..9c97c4f 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/IMediaFileAnalyzer.cs
@@ -16,8 +16,8 @@ public interface IMediaFileAnalyzer
     /// <param name="mode">Analysis mode.</param>
     /// <param name="cancellationToken">Cancellation token from scheduled task.</param>
     /// <returns>Collection of media files that were **unsuccessfully analyzed**.</returns>
-    public IReadOnlyCollection<QueuedEpisode> AnalyzeMediaFiles(
-        IReadOnlyCollection<QueuedEpisode> analysisQueue,
+    public IReadOnlyList<QueuedEpisode> AnalyzeMediaFiles(
+        IReadOnlyList<QueuedEpisode> analysisQueue,
         AnalysisMode mode,
         CancellationToken cancellationToken);
 }
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs
index d1b0db8..0b20f25 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Analyzers/SegmentAnalyzer.cs
@@ -22,8 +22,8 @@ public class SegmentAnalyzer : IMediaFileAnalyzer
     }
 
     /// <inheritdoc />
-    public IReadOnlyCollection<QueuedEpisode> AnalyzeMediaFiles(
-        IReadOnlyCollection<QueuedEpisode> analysisQueue,
+    public IReadOnlyList<QueuedEpisode> AnalyzeMediaFiles(
+        IReadOnlyList<QueuedEpisode> analysisQueue,
         AnalysisMode mode,
         CancellationToken cancellationToken)
     {
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs
index c16c1c0..c6edfc8 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Manager/EdlManager.cs
@@ -48,7 +48,7 @@ public static class EdlManager
     /// If the EDL action is set to a value other than None, update EDL files for the provided episodes.
     /// </summary>
     /// <param name="episodes">Episodes to update EDL files for.</param>
-    public static void UpdateEDLFiles(IReadOnlyCollection<QueuedEpisode> episodes)
+    public static void UpdateEDLFiles(IReadOnlyList<QueuedEpisode> episodes)
     {
         var regenerate = Plugin.Instance!.Configuration.RegenerateEdlFiles;
         var action = Plugin.Instance.Configuration.EdlAction;
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs
index 684bd10..13e981c 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Manager/QueueManager.cs
@@ -241,8 +241,8 @@ public class QueueManager(ILogger<QueueManager> logger, ILibraryManager libraryM
     /// <param name="candidates">Queued media items.</param>
     /// <param name="modes">Analysis mode.</param>
     /// <returns>Media items that have been verified to exist in Jellyfin and in storage.</returns>
-    public (IReadOnlyCollection<QueuedEpisode> VerifiedItems, IReadOnlyCollection<AnalysisMode> RequiredModes)
-        VerifyQueue(IReadOnlyCollection<QueuedEpisode> candidates, IReadOnlyCollection<AnalysisMode> modes)
+    public (IReadOnlyList<QueuedEpisode> VerifiedItems, IReadOnlyCollection<AnalysisMode> RequiredModes)
+        VerifyQueue(IReadOnlyList<QueuedEpisode> candidates, IReadOnlyCollection<AnalysisMode> modes)
     {
         var verified = new List<QueuedEpisode>();
         var reqModes = new HashSet<AnalysisMode>();
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs b/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs
index 55d457d..1c3f449 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/Plugin.cs
@@ -312,10 +312,10 @@ public class Plugin : BasePlugin<PluginConfiguration>, IHasWebPages
 
     internal BaseItem? GetItem(Guid id)
     {
-        return _libraryManager.GetItemById(id);
+        return id != Guid.Empty ? _libraryManager.GetItemById(id) : null;
     }
 
-    internal List<Folder> GetCollectionFolders(Guid id)
+    internal IReadOnlyList<Folder> GetCollectionFolders(Guid id)
     {
         var item = GetItem(id);
         return item is not null ? _libraryManager.GetCollectionFolders(item) : [];
diff --git a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs
index 8c0ff26..1e7bc57 100644
--- a/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs
+++ b/ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs
@@ -112,7 +112,7 @@ public class BaseItemAnalyzerTask
                 return;
             }
 
-            var first = episodes.First();
+            var first = episodes[0];
             if (requiredModes.Count == 0)
             {
                 _logger.LogDebug(
@@ -180,14 +180,14 @@ public class BaseItemAnalyzerTask
     /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>Number of items that were successfully analyzed.</returns>
     private int AnalyzeItems(
-        IReadOnlyCollection<QueuedEpisode> items,
+        IReadOnlyList<QueuedEpisode> items,
         AnalysisMode mode,
         CancellationToken cancellationToken)
     {
         var totalItems = items.Count;
 
         // Only analyze specials (season 0) if the user has opted in.
-        var first = items.First();
+        var first = items[0];
         if (first.SeasonNumber == 0 && !Plugin.Instance!.Configuration.AnalyzeSeasonZero)
         {
             return 0;