diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
index 0244864fcb..da88fdd468 100644
--- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
+++ b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
@@ -268,7 +268,7 @@ namespace Content.Shared.GameObjects.Components.Movement
         bool ICollideSpecial.PreventCollide(IPhysBody collidedWith)
         {
             // Don't collide with other mobs
-            return collidedWith.Owner.HasComponent<SharedSpeciesComponent>();
+            return collidedWith.Entity.HasComponent<SharedSpeciesComponent>();
         }
 
         [Serializable, NetSerializable]
diff --git a/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs b/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs
index f3b3f26352..dbebf69605 100644
--- a/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs
+++ b/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs
@@ -39,7 +39,7 @@ namespace Content.Shared.GameObjects.Components.Projectiles
 
         public bool PreventCollide(IPhysBody collidedwith)
         {
-            return IgnoreShooter && collidedwith.Owner.Uid == Shooter;
+            return IgnoreShooter && collidedwith.Entity.Uid == Shooter;
         }
     }
 }
diff --git a/Content.Shared/Physics/MoverController.cs b/Content.Shared/Physics/MoverController.cs
index 7a08beee11..9225590962 100644
--- a/Content.Shared/Physics/MoverController.cs
+++ b/Content.Shared/Physics/MoverController.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Physics
     public class MoverController : VirtualController
     {
         private Vector2 _velocity;
-        private IPhysicsComponent _component = null;
+        private ICollidableComponent _component = null;
 
         public Vector2 Velocity
         {
@@ -18,7 +18,7 @@ namespace Content.Shared.Physics
             set => _velocity = value;
         }
 
-        public override IPhysicsComponent ControlledComponent
+        public override ICollidableComponent? ControlledComponent
         {
             set => _component = value;
         }
diff --git a/RobustToolbox b/RobustToolbox
index bbbaef5da4..8475c1ae4b 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit bbbaef5da4994fa1a23bfad0897dd628d6131ec1
+Subproject commit 8475c1ae4bada91e8c52fee645e2568c99115864