diff --git a/Content.Server/AI/AimShootLifeProcessor.cs b/Content.Server/AI/AimShootLifeProcessor.cs
index 6b79ab6365..1c63fc0aa4 100644
--- a/Content.Server/AI/AimShootLifeProcessor.cs
+++ b/Content.Server/AI/AimShootLifeProcessor.cs
@@ -19,7 +19,7 @@ namespace Content.Server.AI
     [AiLogicProcessor("AimShootLife")]
     class AimShootLifeProcessor : AiLogicProcessor
     {
-        private readonly ICollisionManager _physMan;
+        private readonly IPhysicsManager _physMan;
         private readonly IServerEntityManager _entMan;
         private readonly IGameTiming _timeMan;
 
@@ -36,7 +36,7 @@ namespace Content.Server.AI
         /// </summary>
         public AimShootLifeProcessor()
         {
-            _physMan = IoCManager.Resolve<ICollisionManager>();
+            _physMan = IoCManager.Resolve<IPhysicsManager>();
             _entMan = IoCManager.Resolve<IServerEntityManager>();
             _timeMan = IoCManager.Resolve<IGameTiming>();
         }
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs
index ddbb8f4a2d..1d9025356d 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs
@@ -26,7 +26,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
             var angle = new Angle(clicklocation.Position - userPosition);
 
             var ray = new Ray(userPosition, angle.ToVec());
-            var rayCastResults = IoCManager.Resolve<ICollisionManager>().IntersectRay(ray, MaxLength,
+            var rayCastResults = IoCManager.Resolve<IPhysicsManager>().IntersectRay(ray, MaxLength,
                 Owner.Transform.GetMapTransform().Owner);
 
             Hit(rayCastResults);
diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
index afd9d2006d..cc182a0df5 100644
--- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
@@ -137,6 +137,13 @@ namespace Content.Server.GameObjects.EntitySystems
 
         private void HandleUseItemInHand(ICommonSession session, GridLocalCoordinates coords, EntityUid uid)
         {
+            // client sanitization
+            if(!coords.IsValidLocation())
+            {
+                Logger.InfoS("interaction", $"Invalid Coordinates: client={session}, coords={coords}");
+                return;
+            }
+
             UserInteraction(((IPlayerSession)session).AttachedEntity, coords, uid);
         }
 
diff --git a/engine b/engine
index 99ab6fce9c..d8ca95db0c 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 99ab6fce9c63e77401d2cb97cb8cff62dff183e3
+Subproject commit d8ca95db0c1a8e1db48465352e29c7650b3afc81