diff --git a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
index d826fd0bd8..e9d39b8c2f 100644
--- a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
@@ -6,6 +6,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Atmos
@@ -18,7 +19,7 @@ namespace Content.Server.GameObjects.Components.Atmos
 
         public override string Name => "Airtight";
 
-        [DataFieldWithFlag("airBlockedDirection", typeof(AtmosDirectionFlags))]
+        [DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer<AtmosDirectionFlags>))]
         [ViewVariables]
         private int _initialAirBlockedDirection = (int) AtmosDirection.All;
 
diff --git a/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
index 44a87e99bd..67c1e8c480 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
+++ b/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
@@ -4,9 +4,11 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.GameObjects.Components.Items.Storage
 {
@@ -59,7 +61,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
         [DataDefinition]
         public struct StorageFillEntry : IPopulateDefaultValues
         {
-            [DataField("name")]
+            [DataField("name", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
             public string? PrototypeName;
 
             [DataField("prob")]
diff --git a/Content.YAMLLinter/Program.cs b/Content.YAMLLinter/Program.cs
index 56c3606b42..3e6c18f524 100644
--- a/Content.YAMLLinter/Program.cs
+++ b/Content.YAMLLinter/Program.cs
@@ -90,15 +90,15 @@ namespace Content.YAMLLinter
 
             foreach (var (key, val) in serverErrors)
             {
+                var newErrors = val.Where(n => n.AlwaysRelevant).ToHashSet();
                 if (clientErrors.TryGetValue(key, out var clientVal))
                 {
-                    var newErrors = val.Intersect(clientVal).ToHashSet();
-                    newErrors.UnionWith(val.Where(n => n.AlwaysRelevant));
+                    newErrors.UnionWith(val.Intersect(clientVal));
                     newErrors.UnionWith(clientVal.Where(n => n.AlwaysRelevant));
-                    if (newErrors.Count == 0) continue;
-
-                    allErrors[key] = newErrors;
                 }
+
+                if (newErrors.Count == 0) continue;
+                allErrors[key] = newErrors;
             }
 
             return allErrors;