diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ff28ac6f11..523225dc98 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -806,6 +806,7 @@ bullet.reload = [stat]{0}[lightgray]x fire rate
 unit.blocks = blocks
 unit.blockssquared = blocks²
 unit.powersecond = power units/second
+unit.tilessecond = tiles/second
 unit.liquidsecond = liquid units/second
 unit.itemssecond = items/second
 unit.liquidunits = liquid units
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index f4c7ae7d25..6e0d5b62a7 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1978,25 +1978,25 @@ public class Blocks implements ContentList{
         }};
 
         repairPoint = new RepairPoint("repair-point"){{
-            requirements(Category.units, with(Items.lead, 25, Items.copper, 25, Items.silicon, 20));
-            repairSpeed = 0.5f;
-            repairRadius = 65f;
+            requirements(Category.units, with(Items.lead, 30, Items.copper, 30, Items.silicon, 20));
+            repairSpeed = 0.45f;
+            repairRadius = 60f;
             beamWidth = 0.73f;
             powerUse = 1f;
             pulseRadius = 5f;
         }};
 
         repairTurret = new RepairPoint("repair-turret"){{
-            requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 80));
+            requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 60));
             size = 2;
             length = 6f;
             repairSpeed = 3f;
-            repairRadius = 140f;
+            repairRadius = 145f;
             powerUse = 5f;
             beamWidth = 1.1f;
             pulseRadius = 6.1f;
             coolantUse = 0.16f;
-            coolantMultiplier = 1.5f;
+            coolantMultiplier = 1.6f;
             acceptCoolant = true;
         }};
 
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index f442cce68c..7e0b55ce65 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -255,7 +255,7 @@ public class UnitType extends UnlockableContent{
 
         stats.add(Stat.health, health);
         stats.add(Stat.armor, armor);
-        stats.add(Stat.speed, speed);
+        stats.add(Stat.speed, speed * 60f / tilesize, StatUnit.tilesSecond);
         stats.add(Stat.size, hitSize / tilesize, StatUnit.blocksSquared);
         stats.add(Stat.itemCapacity, itemCapacity);
         stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks);
diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
index 523edb9654..61846220bd 100644
--- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
@@ -75,7 +75,7 @@ public class PayloadConveyor extends Block{
 
         @Override
         public boolean canControlSelect(Player player){
-            return this.item == null && !player.unit().spawnedByCore && player.unit().hitSize / tilesize <= payloadLimit && player.tileOn().build == this;
+            return this.item == null && !player.unit().spawnedByCore && player.unit().hitSize / tilesize <= payloadLimit && player.tileOn() != null && player.tileOn().build == this;
         }
 
         @Override
diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java
index 92df3265a5..e35ce74402 100644
--- a/core/src/mindustry/world/meta/StatUnit.java
+++ b/core/src/mindustry/world/meta/StatUnit.java
@@ -10,6 +10,7 @@ import java.util.*;
 public enum StatUnit{
     blocks,
     blocksSquared,
+    tilesSecond,
     powerSecond,
     liquidSecond,
     itemsSecond,
diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java
index 30f27ed646..92b8803f85 100644
--- a/desktop/src/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/mindustry/desktop/steam/SNet.java
@@ -305,7 +305,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
 
     @Override
     public void onLobbyMatchList(int matches){
-        Log.info("found @ matches @", matches, lobbyDoneCallback);
+        Log.info("found @ matches", matches);
 
         if(lobbyDoneCallback != null){
             Seq<Host> hosts = new Seq<>();