diff --git a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
index 5cd2ac3048..9782becc27 100644
--- a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
@@ -13,8 +13,8 @@ public sealed partial class ContainerSpawnPointComponent : Component
     /// <summary>
     /// The ID of the container that this entity will spawn players into
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public string ContainerId;
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    public string ContainerId = string.Empty;
 
     /// <summary>
     /// An optional job specifier
diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
index 65f1076700..15c4031d58 100644
--- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -79,7 +79,7 @@ public sealed class ContainerSpawnPointSystem : EntitySystem
             return;
         }
 
-        Del(args.Station);
+        Del(args.SpawnResult);
         args.SpawnResult = null;
     }
 }
diff --git a/Resources/Prototypes/Entities/Structures/cryopod.yml b/Resources/Prototypes/Entities/Structures/cryopod.yml
index c4d1388700..9063e8b138 100644
--- a/Resources/Prototypes/Entities/Structures/cryopod.yml
+++ b/Resources/Prototypes/Entities/Structures/cryopod.yml
@@ -21,7 +21,8 @@
     access: [["Cryogenics"]]
   - type: InteractionOutline
   - type: Cryostorage
-  - type: Climbable
+  - type: Physics
+    canCollide: false
   - type: DragInsertContainer
     containerId: storage
   - type: ExitContainerOnMove
@@ -46,7 +47,7 @@
 - type: entity
   parent: CryogenicSleepUnit
   id: CryogenicSleepUnitSpawner
-  suffix: Spawner, All
+  suffix: Spawner, Roundstart AllJobs
   components:
   - type: ContainerSpawnPoint
     containerId: storage