diff --git a/Jellyfin.Plugin.PhoenixAdult/Core/ImageProvider.cs b/Jellyfin.Plugin.PhoenixAdult/Core/ImageProvider.cs
index 3762dd9c..2a87d6a7 100644
--- a/Jellyfin.Plugin.PhoenixAdult/Core/ImageProvider.cs
+++ b/Jellyfin.Plugin.PhoenixAdult/Core/ImageProvider.cs
@@ -32,7 +32,6 @@ public class ImageProvider : IRemoteImageProvider
             ImageType.Backdrop,
         };
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Temporal solution")]
 #if __EMBY__
         public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, LibraryOptions libraryOptions, CancellationToken cancellationToken)
 #else
diff --git a/Jellyfin.Plugin.PhoenixAdult/Core/Provider.cs b/Jellyfin.Plugin.PhoenixAdult/Core/Provider.cs
index 2b7b5999..101160a6 100644
--- a/Jellyfin.Plugin.PhoenixAdult/Core/Provider.cs
+++ b/Jellyfin.Plugin.PhoenixAdult/Core/Provider.cs
@@ -47,7 +47,6 @@ public Provider(
 
         public string Name => Plugin.Instance.Name;
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Temporal solution")]
         public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo searchInfo, CancellationToken cancellationToken)
         {
             List<RemoteSearchResult> result = new List<RemoteSearchResult>();
@@ -165,7 +164,6 @@ public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo se
             return result;
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Temporal solution")]
         public async Task<MetadataResult<Movie>> GetMetadata(MovieInfo info, CancellationToken cancellationToken)
         {
             var result = new MetadataResult<Movie>
diff --git a/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs b/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs
index 2d8d3b8d..bd48b074 100644
--- a/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs
+++ b/Jellyfin.Plugin.PhoenixAdult/Helpers/Actors.cs
@@ -27,11 +27,14 @@ public static List<PersonInfo> Cleanup(MetadataResult<Movie> scene)
             {
                 var newPeople = new PersonInfo
                 {
-                    Type = people.Type,
                     ImageUrl = people.ImageUrl,
                 };
 
-                if (newPeople.Type == null)
+                if (newPeople.Type != null)
+                {
+                    newPeople.Type = people.Type;
+                }
+                else
                 {
                     newPeople.Type = PersonType.Actor;
                 }
diff --git a/Jellyfin.Plugin.PhoenixAdult/Helpers/Helper.cs b/Jellyfin.Plugin.PhoenixAdult/Helpers/Helper.cs
index 4dc53381..a162cdea 100644
--- a/Jellyfin.Plugin.PhoenixAdult/Helpers/Helper.cs
+++ b/Jellyfin.Plugin.PhoenixAdult/Helpers/Helper.cs
@@ -267,7 +267,6 @@ public static string GetSiteNameFromTitle(string searchTitle)
             return searchTitle;
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Dirty hack for https://github.com/dotnet/corefx/issues/30793")]
         public static byte[] ConvertFromBase64String(string input)
         {
             if (string.IsNullOrWhiteSpace(input))