diff --git a/Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs b/Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs
index 7a9a15ed8b..0aed2ba10a 100644
--- a/Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs
+++ b/Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs
@@ -71,28 +71,16 @@ public sealed class EntityCrimeRecordsOverlay : Overlay
 
             if (GetRecord(hum.Owner, args.MapId, out var criminalType))
             {
-                var icon = "released";
-                switch (criminalType)
+                var icon = criminalType switch
                 {
-                    case EnumCriminalRecordType.Released:
-                        icon = "released";
-                        break;
-                    case EnumCriminalRecordType.Discharged:
-                        icon = "discharged";
-                        break;
-                    case EnumCriminalRecordType.Parolled:
-                        icon = "parolled";
-                        break;
-                    case EnumCriminalRecordType.Suspected:
-                        icon = "suspected";
-                        break;
-                    case EnumCriminalRecordType.Wanted:
-                        icon = "wanted";
-                        break;
-                    case EnumCriminalRecordType.Incarcerated:
-                        icon = "incarcerated";
-                        break;
-                }
+                    EnumCriminalRecordType.Released => "released",
+                    EnumCriminalRecordType.Discharged => "discharged",
+                    EnumCriminalRecordType.Parolled => "parolled",
+                    EnumCriminalRecordType.Suspected => "suspected",
+                    EnumCriminalRecordType.Wanted => "wanted",
+                    EnumCriminalRecordType.Incarcerated => "incarcerated",
+                    _ => "released"
+                };
 
                 var sprite_icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/White/Interface/records.rsi"), icon);
                 var _iconTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite_icon);
diff --git a/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs b/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs
index c202e4e1e3..a7e62ea999 100644
--- a/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs
+++ b/Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs
@@ -62,7 +62,7 @@ public sealed class EntityHealthBarOverlay : Overlay
         var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
         var rotationMatrix = Matrix3.CreateRotation(-rotation);
 
-        foreach (var (mob, dmg) in _entManager.EntityQuery<MobStateComponent, DamageableComponent>(true))
+        foreach (var (mob, dmg, threasholds) in _entManager.EntityQuery<MobStateComponent, DamageableComponent, MobThresholdsComponent>(true))
         {
             if (!xformQuery.TryGetComponent(mob.Owner, out var xform) ||
                 xform.MapID != args.MapId)
diff --git a/Content.Server/White/CriminalRecords/CriminalRecordsServerSystem.cs b/Content.Server/White/CriminalRecords/CriminalRecordsServerSystem.cs
new file mode 100644
index 0000000000..413c8b22ab
--- /dev/null
+++ b/Content.Server/White/CriminalRecords/CriminalRecordsServerSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared.White.CriminalRecords;
+using Robust.Server.GameStates;
+using Robust.Shared.GameStates;
+
+namespace Content.Server.White.CriminalRecords;
+
+public sealed class CriminalRecordsServerSystem : EntitySystem
+{
+    [Dependency] private readonly PVSOverrideSystem _pvsSys = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<CriminalRecordsServerComponent, ComponentStartup>(OnCompInit);
+        SubscribeLocalEvent<CriminalRecordsServerComponent, ComponentRemove>(OnCompRemove);
+    }
+
+    private void OnCompInit(EntityUid uid, CriminalRecordsServerComponent component, ComponentStartup args)
+    {
+        _pvsSys.AddGlobalOverride(uid);
+    }
+
+    private void OnCompRemove(EntityUid uid, CriminalRecordsServerComponent component, ComponentRemove args)
+    {
+        _pvsSys.ClearOverride(uid);
+    }
+}
diff --git a/Content.Shared/White/CriminalRecords/CriminalRecordsServerComponent.cs b/Content.Shared/White/CriminalRecords/CriminalRecordsServerComponent.cs
index eb0a412d5c..0390c27025 100644
--- a/Content.Shared/White/CriminalRecords/CriminalRecordsServerComponent.cs
+++ b/Content.Shared/White/CriminalRecords/CriminalRecordsServerComponent.cs
@@ -33,8 +33,7 @@ public sealed class CriminalRecordInfo
     }
 }
 
-[RegisterComponent]
-[NetworkedComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class CriminalRecordsServerComponent : Component
 {
     [DataField("Cache")] public Dictionary<StationRecordKey, CriminalRecordInfo> Cache = new();
diff --git a/Content.Shared/White/CriminalRecords/CriminalRecordsServerSystem.cs b/Content.Shared/White/CriminalRecords/SharedCriminalRecordsServerSystem.cs
similarity index 97%
rename from Content.Shared/White/CriminalRecords/CriminalRecordsServerSystem.cs
rename to Content.Shared/White/CriminalRecords/SharedCriminalRecordsServerSystem.cs
index 5e8286cdbe..d568af663c 100644
--- a/Content.Shared/White/CriminalRecords/CriminalRecordsServerSystem.cs
+++ b/Content.Shared/White/CriminalRecords/SharedCriminalRecordsServerSystem.cs
@@ -1,9 +1,11 @@
 using Content.Shared.StationRecords;
+using JetBrains.Annotations;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.White.CriminalRecords;
 
-public sealed class CriminalRecordsServerSystem: EntitySystem
+[PublicAPI]
+public class SharedCriminalRecordsServerSystem: EntitySystem
 {
     public override void Initialize()
     {