diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
index 14dc68a327..1f73755f5d 100644
--- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Querying;
 
-namespace Jellyfin.Server.Implementations.Item;
+namespace Emby.Server.Implementations.Data;
 
 /// <summary>
 /// Provides static topic based lookups for the BaseItemKind.
diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs
index 11559419c1..f537ffa11e 100644
--- a/Jellyfin.Api/Controllers/MoviesController.cs
+++ b/Jellyfin.Api/Controllers/MoviesController.cs
@@ -97,7 +97,7 @@ public class MoviesController : BaseJellyfinApiController
             DtoOptions = dtoOptions
         };
 
-        var recentlyPlayedMovies = _libraryManager.GetItemList(query)!;
+        var recentlyPlayedMovies = _libraryManager.GetItemList(query);
 
         var itemTypes = new List<BaseItemKind> { BaseItemKind.Movie };
         if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions)
diff --git a/Jellyfin.Data/Entities/BaseItemProvider.cs b/Jellyfin.Data/Entities/BaseItemProvider.cs
index 1fc721d6a2..9a1565728d 100644
--- a/Jellyfin.Data/Entities/BaseItemProvider.cs
+++ b/Jellyfin.Data/Entities/BaseItemProvider.cs
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace Jellyfin.Data.Entities;
 
 /// <summary>
-/// Represents an Key-Value relaten of an BaseItem's provider.
+/// Represents a Key-Value relation of an BaseItem's provider.
 /// </summary>
 public class BaseItemProvider
 {
diff --git a/Jellyfin.Data/Entities/MediaStreamInfo.cs b/Jellyfin.Data/Entities/MediaStreamInfo.cs
index a46d3f1958..1198026e72 100644
--- a/Jellyfin.Data/Entities/MediaStreamInfo.cs
+++ b/Jellyfin.Data/Entities/MediaStreamInfo.cs
@@ -6,10 +6,6 @@ namespace Jellyfin.Data.Entities;
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 public class MediaStreamInfo
 {
-    public MediaStreamInfo()
-    {
-    }
-
     public required Guid ItemId { get; set; }
 
     public required BaseItemEntity Item { get; set; }
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
index f44ead6e02..df434fdb36 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -37,7 +37,7 @@ public class MediaStreamRepository(IDbContextFactory<JellyfinDbContext> dbProvid
     public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
     {
         using var context = dbProvider.CreateDbContext();
-        return TranslateQuery(context.MediaStreamInfos, filter).ToList().Select(Map).ToImmutableArray();
+        return TranslateQuery(context.MediaStreamInfos, filter).AsEnumerable().Select(Map).ToImmutableArray();
     }
 
     private string? GetPathToSave(string? path)
diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
index 1b2ca2acb5..6ad8380d7c 100644
--- a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
+++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
@@ -51,7 +51,7 @@ public interface IItemTypeLookup
     public IReadOnlyList<BaseItemKind> ArtistsTypes { get; }
 
     /// <summary>
-    /// Gets mapping for all BaseItemKinds and their expected serialisaition target.
+    /// Gets mapping for all BaseItemKinds and their expected serialization target.
     /// </summary>
     public IDictionary<BaseItemKind, string?> BaseItemKindNames { get; }
 }
diff --git a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
index 43a24703e4..418289cb4c 100644
--- a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
@@ -14,7 +14,7 @@ public interface IPeopleRepository
     /// Gets the people.
     /// </summary>
     /// <param name="filter">The query.</param>
-    /// <returns>List&lt;PersonInfo&gt;.</returns>
+    /// <returns>The list of people matching the filter.</returns>
     IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter);
 
     /// <summary>
@@ -28,6 +28,6 @@ public interface IPeopleRepository
     /// Gets the people names.
     /// </summary>
     /// <param name="filter">The query.</param>
-    /// <returns>List&lt;System.String&gt;.</returns>
+    /// <returns>The list of people names matching the filter.</returns>
     IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter);
 }