diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index d6aff3d11d..e2902bca83 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -33,7 +33,7 @@ import static arc.scene.actions.Actions.*;
 import static mindustry.Vars.*;
 
 public class UI implements ApplicationListener, Loadable{
-    private static String billions, millions, thousands;
+    public static String billions, millions, thousands;
 
     public static PixmapPacker packer;
 
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index ca002353bc..4fb99cf01a 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -285,8 +285,7 @@ public class Weapon implements Cloneable{
         can && //must be able to shoot
         (!useAmmo || unit.ammo > 0 || !state.rules.unitAmmo || unit.team.rules().infiniteAmmo) && //check ammo
         (!alternate || mount.side == flipSprite) &&
-        //TODO checking for velocity this way isn't entirely correct
-        (unit.vel.len() >= mount.weapon.minShootVelocity || (net.active() && !unit.isLocal())) && //check velocity requirements
+        unit.vel.len() >= mount.weapon.minShootVelocity && //check velocity requirements
         mount.reload <= 0.0001f && //reload has to be 0
         Angles.within(rotate ? mount.rotation : unit.rotation, mount.targetRotation, mount.weapon.shootCone) //has to be within the cone
         ){
diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
index e63acaac4e..ecad1514fa 100644
--- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
+++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java
@@ -14,6 +14,7 @@ import arc.scene.ui.layout.Stack;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -200,9 +201,9 @@ public class BlockInventoryFragment extends Fragment{
     private String round(float f){
         f = (int)f;
         if(f >= 1000000){
-            return (int)(f / 1000000f) + "[gray]" + Core.bundle.getOrNull("unit.millions") + "[]";
+            return (int)(f / 1000000f) + "[gray]" + UI.millions;
         }else if(f >= 1000){
-            return (int)(f / 1000) + Core.bundle.getOrNull("unit.thousands");
+            return (int)(f / 1000) + UI.thousands;
         }else{
             return (int)f + "";
         }
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index 52844719d7..4106277667 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -281,7 +281,7 @@ public class CoreBlock extends StorageBlock{
         @Override
         public void afterDestroyed(){
             if(state.rules.coreCapture){
-                tile.setBlock(block, lastDamage);
+                tile.setNet(block, lastDamage, 0);
                 //core is invincible for several seconds to prevent recapture
                 ((CoreBuild)tile.build).iframes = captureInvicibility;
             }