diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
index e909306086..bc6c5e37cc 100644
--- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
@@ -83,6 +83,12 @@ public class DebugBlocks extends BlockList implements ContentList{
                 return true;
             }
 
+            @Override
+            public void setBars(){
+                super.setBars();
+                bars.remove(BarType.inventory);
+            }
+
             @Override
             public void update(Tile tile){
                 SorterEntity entity = tile.entity();
diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
index 242d7ce543..89a92f1739 100644
--- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
@@ -46,7 +46,7 @@ public class OverlayRenderer{
     public void drawTop(){
 
         for(Player player : players){
-            if(player.isDead()) continue; //dead player don't draw
+            if(player.isDead()) continue; //dead players don't draw
 
             InputHandler input = control.input(player.playerIndex);
 
@@ -83,7 +83,7 @@ public class OverlayRenderer{
             Draw.reset();
 
             //draw selected block bars and info
-            if(input.recipe == null && !ui.hasMouse() && !input.frag.config.isShown()){
+            if(input.recipe == null && !ui.hasMouse()){
                 Vector2 vec = Graphics.world(input.getMouseX(), input.getMouseY());
                 Tile tile = world.tileWorld(vec.x, vec.y);
 
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index d1b56e4105..6b50423a75 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -567,19 +567,21 @@ public class MobileInput extends InputHandler implements GestureListener{
             //add to selection queue if it's a valid BREAK position
             cursor = cursor.target();
             selection.add(new PlaceRequest(cursor.worldx(), cursor.worldy()));
-        }else if(!canTapPlayer(worldx, worldy) && player.mech.flying){
+        }else if(!canTapPlayer(worldx, worldy)){
             boolean consumed = false;
             //else, try and carry units
-            if(player.getCarry() != null){
-                consumed = true;
-                player.dropCarry(); //drop off unit
-            }else{
-                Unit unit = Units.getClosest(player.getTeam(), Graphics.world(x, y).x, Graphics.world(x, y).y, 4f, u -> !u.isFlying() && u.getMass() <= player.mech.carryWeight);
-
-                if(unit != null){
-                    player.moveTarget = unit;
+            if(player.mech.flying){
+                if(player.getCarry() != null){
                     consumed = true;
-                    Effects.effect(Fx.select, unit.getX(), unit.getY());
+                    player.dropCarry(); //drop off unit
+                }else{
+                    Unit unit = Units.getClosest(player.getTeam(), Graphics.world(x, y).x, Graphics.world(x, y).y, 4f, u -> !u.isFlying() && u.getMass() <= player.mech.carryWeight);
+
+                    if(unit != null){
+                        player.moveTarget = unit;
+                        consumed = true;
+                        Effects.effect(Fx.select, unit.getX(), unit.getY());
+                    }
                 }
             }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
index 967fb61ab7..4e5f9875f9 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
@@ -79,6 +79,7 @@ public class CoreBlock extends StorageBlock{
 
     @Remote(called = Loc.server)
     public static void setCoreSolid(Tile tile, boolean solid){
+        if(tile == null) return;
         CoreEntity entity = tile.entity();
         if(entity != null) entity.solid = solid;
     }