diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
index 86cd8cbc18..527bb62b15 100644
--- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
+++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
@@ -36,41 +36,6 @@ public sealed class PrototypeSaveTest
     {
         "Singularity", // physics collision uses "AllMask" (-1). The flag serializer currently fails to save this because this features un-named bits.
         "constructionghost",
-
-        // TODO fix more prototypes
-        // The rest of these prototypes (probably) shouldn't be getting ignored.
-        // There should be an issue up tracking all of these prototypes, indicating that still need to get fixed.
-        "HeadSkeleton",
-        // The followjng are all fixture-less phsyics entities that set can-collide to false on init.
-        "CarpRift",
-        "GasMinerOxygen",
-        "GasMinerNitrogen",
-        "GasMinerCarbonDioxide",
-        "GasMinerPlasma",
-        "GasMinerTritium",
-        "GasMinerWaterVapor",
-        "GasMinerMiasma",
-        "GasMinerNitrousOxide",
-        "SignalSwitch",
-        "SignalButton",
-        "ApcNetSwitch",
-        "SignalButtonExt1",
-        "SignalButtonExt2",
-        "SignalButtonExt3",
-        "SignalButtonBridge",
-        "SignalButtonWindows",
-        "GrilleBroken",
-        "BaseGeneratorWallmountFrame",
-        "GeneratorWallmountBasic",
-        "GeneratorWallmountAPU",
-        "Lightning",
-        "LightningRevenant",
-        "ChargedLightning",
-        "SuperchargedLightning",
-        "HyperchargedLightning",
-        "BaseSubstationWall",
-        "SubstationWallBasic",
-        "BaseSubstationWallFrame"
     };
 
     [Test]
diff --git a/Content.Server/Speech/VocalSystem.cs b/Content.Server/Speech/VocalSystem.cs
index bbc2d76539..9c08518e8d 100644
--- a/Content.Server/Speech/VocalSystem.cs
+++ b/Content.Server/Speech/VocalSystem.cs
@@ -32,11 +32,11 @@ public sealed class VocalSystem : EntitySystem
         base.Initialize();
 
         SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnActionPerform);
-        SubscribeLocalEvent<VocalComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<VocalComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<VocalComponent, ComponentShutdown>(OnShutdown);
     }
 
-    private void OnStartup(EntityUid uid, VocalComponent component, ComponentStartup args)
+    private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
     {
         if (component.ScreamAction == null
             && _proto.TryIndex(component.ActionId, out InstantActionPrototype? act))
diff --git a/Resources/Prototypes/Entities/Effects/lightning.yml b/Resources/Prototypes/Entities/Effects/lightning.yml
index c4b1dcd1f1..0f5ee91264 100644
--- a/Resources/Prototypes/Entities/Effects/lightning.yml
+++ b/Resources/Prototypes/Entities/Effects/lightning.yml
@@ -11,6 +11,7 @@
     - state: "lightning_1"
       shader: unshaded
   - type: Physics
+    canCollide: false
   - type: Electrified
     requirePower: false
   - type: Lightning
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
index 0e0225a865..748cbc1954 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -9,6 +9,7 @@
     - type: Clickable
     - type: InteractionOutline
     - type: Physics
+      canCollide: false
     - type: Fixtures
     - type: Transform
       anchored: true
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index 17816d83b3..311e41d8c2 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -96,6 +96,9 @@
   - type: Fixtures
   - type: Transform
     anchored: true
+  - type: Physics
+    bodyType: Static
+    canCollide: false
   - type: Sprite
     drawdepth: WallMountedItems
     netsync: false
@@ -132,6 +135,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    canCollide: false
   - type: Fixtures
   - type: Transform
     anchored: true
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 3de23a44d3..38a9846240 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -102,6 +102,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+    canCollide: false
   - type: Fixtures
   - type: Transform
     anchored: true
@@ -202,6 +203,7 @@
   - type: InteractionOutline
   - type: Physics
     bodyType: Static
+    canCollide: false
   - type: Fixtures
   - type: Transform
     anchored: true
diff --git a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
index c4a98c593d..2586036e9a 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
@@ -10,6 +10,7 @@
       anchored: true
     - type: Physics
       bodyType: Static
+      canCollide: false
     - type: Fixtures
     - type: Sprite
       netsync: false
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 0e7c8bdff4..865f9cc743 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -12,6 +12,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    canCollide: false
   - type: Sprite
     sprite: Structures/Wallmounts/switch.rsi
     state: on
@@ -42,6 +43,7 @@
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
+    canCollide: false
   - type: Sprite
     sprite: Structures/Wallmounts/switch.rsi
     state: dead
@@ -87,6 +89,7 @@
     - type: Clickable
     - type: InteractionOutline
     - type: Physics
+      canCollide: false
     - type: Transform
       anchored: true
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index ed31c9262b..b3123dc6a7 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -94,6 +94,9 @@
       node: grilleBroken
       deconstructionTarget: start
     - type: Fixtures # overwrite BaseStructure parent.
+    - type: Physics
+      bodyType: Static
+      canCollide: false
     - type: Damageable
       damageContainer: Inorganic
       damageModifierSet: FlimsyMetallic