diff --git a/OpenDreamClient/Input/MouseInputSystem.cs b/OpenDreamClient/Input/MouseInputSystem.cs
index a168ab5f11..eef0133c9f 100644
--- a/OpenDreamClient/Input/MouseInputSystem.cs
+++ b/OpenDreamClient/Input/MouseInputSystem.cs
@@ -111,6 +111,8 @@ public void HandleAtomMouseMove(ScalingViewport viewport, Vector2 relativePos, C
 
         var mapCoords = viewport.ScreenToMap(globalPos.Position);
         var mousePos = (relativePos - viewportBox.TopLeft) / viewportBox.Size * viewport.ViewportSize;
+        if (mousePos.X >= _dreamViewOverlay.MouseMap.Size.X || mousePos.Y >= _dreamViewOverlay.MouseMap.Size.Y)
+            return null;
 
         if(_configurationManager.GetCVar(CVars.DisplayCompat))
             return null; //Compat mode causes crashes with RT's GetPixel because OpenGL ES doesn't support GetTexImage()
diff --git a/OpenDreamClient/Rendering/ClientScreenOverlaySystem.cs b/OpenDreamClient/Rendering/ClientScreenOverlaySystem.cs
index 64dbfd85a5..add5b3d060 100644
--- a/OpenDreamClient/Rendering/ClientScreenOverlaySystem.cs
+++ b/OpenDreamClient/Rendering/ClientScreenOverlaySystem.cs
@@ -3,7 +3,7 @@
 namespace OpenDreamClient.Rendering;
 
 internal sealed class ClientScreenOverlaySystem : SharedScreenOverlaySystem {
-    public HashSet<EntityUid> ScreenObjects = new();
+    public readonly HashSet<EntityUid> ScreenObjects = new();
 
     [Dependency] private readonly IEntityManager _entityManager = default!;
 
diff --git a/OpenDreamClient/Rendering/DreamViewOverlay.cs b/OpenDreamClient/Rendering/DreamViewOverlay.cs
index ead729a933..8dc7eec585 100644
--- a/OpenDreamClient/Rendering/DreamViewOverlay.cs
+++ b/OpenDreamClient/Rendering/DreamViewOverlay.cs
@@ -434,7 +434,7 @@ public void DrawIcon(DrawingHandleWorld handle, Vector2i renderTargetSize, Rende
         }
 
         //Maptext
-        if(iconMetaData.Maptext != null) {
+        if (!string.IsNullOrWhiteSpace(iconMetaData.Maptext)) {
             var maptextSize = iconMetaData.MaptextSize!.Value;
             if (maptextSize.X == 0)
                 maptextSize.X = 32;
diff --git a/OpenDreamShared/Dream/MouseOpacity.cs b/OpenDreamShared/Dream/MouseOpacity.cs
index dd9c392d60..4cd398c96d 100644
--- a/OpenDreamShared/Dream/MouseOpacity.cs
+++ b/OpenDreamShared/Dream/MouseOpacity.cs
@@ -1,7 +1,7 @@
-namespace OpenDreamShared.Dream {
-    public enum MouseOpacity {
-        Transparent = 0,
-        PixelOpaque = 1,
-        Opaque = 2
-    }
+namespace OpenDreamShared.Dream;
+
+public enum MouseOpacity {
+    Transparent = 0,
+    PixelOpaque = 1,
+    Opaque = 2
 }