diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index 0379e01..0f3ab4c 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -1,3 +1,4 @@
+using Robust.Server.ServerStatus;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -12,6 +13,10 @@ public class EntryPoint : GameServer
     {
         base.Init();
 
+        // Configure ACZ correctly.
+        IoCManager.Resolve<IStatusHost>().SetAczInfo(
+            "Content.Client", new []{"Content.Client", "Content.Shared"});
+        
         var factory = IoCManager.Resolve<IComponentFactory>();
 
         factory.DoAutoRegistrations();
diff --git a/RobustToolbox b/RobustToolbox
index e3dc446..75d37f8 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit e3dc446e9ea75d6802686397cf19023bd4433e64
+Subproject commit 75d37f83096e968b3f69d79843d606cc0ec655a4