diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index f86a9424e1..bded2e7706 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -234,7 +234,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
                     ai.commandPosition(posTarget);
                 }
             }
+        }
 
+        if(unitIds.length > 0 && player == Vars.player){
             if(teamTarget != null){
                 Fx.attackCommand.at(teamTarget);
             }else{
diff --git a/core/src/mindustry/type/weapons/RepairBeamWeapon.java b/core/src/mindustry/type/weapons/RepairBeamWeapon.java
index fdd7d28692..e29bbcff20 100644
--- a/core/src/mindustry/type/weapons/RepairBeamWeapon.java
+++ b/core/src/mindustry/type/weapons/RepairBeamWeapon.java
@@ -110,10 +110,10 @@ public class RepairBeamWeapon extends Weapon{
         wy = unit.y + Angles.trnsy(weaponRotation, x, y);
 
         HealBeamMount heal = (HealBeamMount)mount;
-        heal.target = null;
         boolean canShoot = mount.shoot;
 
         if(!autoTarget){
+            heal.target = null;
             if(canShoot){
                 heal.lastEnd.set(heal.aimX, heal.aimY);
 
diff --git a/core/src/mindustry/world/blocks/defense/AutoDoor.java b/core/src/mindustry/world/blocks/defense/AutoDoor.java
index 7161536135..b7ca150680 100644
--- a/core/src/mindustry/world/blocks/defense/AutoDoor.java
+++ b/core/src/mindustry/world/blocks/defense/AutoDoor.java
@@ -76,9 +76,11 @@ public class AutoDoor extends Wall{
 
         public void setOpen(boolean open){
             this.open = open;
-            (!open ? closefx : openfx).at(this, size);
-            doorSound.at(this);
             pathfinder.updateTile(tile);
+            if(wasVisible){
+                (!open ? closefx : openfx).at(this, size);
+                doorSound.at(this);
+            }
         }
 
         @Override