diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index f766e55211f..1093ec9eadf 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -565,13 +565,13 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid,
         {
             // Joint startup
             var union = _physics.GetHardAABB(pullerUid).Union(_physics.GetHardAABB(pullableUid, body: pullablePhysics));
-            var length = Math.Max(union.Size.X, union.Size.Y) * 0.75f;
+            var length = Math.Max(union.Size.X, union.Size.Y) * 0.65f;
 
             var joint = _joints.CreateDistanceJoint(pullableUid, pullerUid, id: pullableComp.PullJointId);
-            joint.CollideConnected = false;
+            joint.CollideConnected = true;
             // This maximum has to be there because if the object is constrained too closely, the clamping goes backwards and asserts.
             joint.MaxLength = Math.Max(1.0f, length);
-            joint.Length = length * 0.75f;
+            joint.Length = length * 0.65f;
             joint.MinLength = 0f;
             joint.Stiffness = 1f;
 
diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 775ccb7c446..36ee603fe16 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -31,7 +31,7 @@ public enum CollisionGroup
 
     // Humanoids, etc.
     MobMask = Impassable | HighImpassable | MidImpassable | LowImpassable,
-    MobLayer = Opaque | BulletImpassable,
+    MobLayer = Opaque | BulletImpassable | MidImpassable,
     // Mice, drones
     SmallMobMask = Impassable | LowImpassable,
     SmallMobLayer = Opaque | BulletImpassable,
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index c98608fabb5..df358d345ed 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -9,7 +9,7 @@
     noRot: true
     drawdepth: Mobs
   - type: Physics
-    bodyType: KinematicController
+    bodyType: Dynamic
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 9d89f86a7a5..f3c27908b92 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -44,7 +44,7 @@
           bounds: "-0.25,-0.48,0.25,0.48"
         density: 75
         mask:
-        - MachineMask
+        - CrateMask
         layer:
         - MachineLayer
   - type: EntityStorage