diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 5476fadc6f..cd8b50aa3c 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -472,7 +472,7 @@ public class JoinDialog extends BaseDialog{
     }
 
     int columns(){
-        return Mathf.clamp((int)((Core.graphics.getWidth() / Scl.scl() * 0.85f) / targetWidth()), 1, 3);
+        return Mathf.clamp((int)((Core.graphics.getWidth() / Scl.scl() * 0.9f) / targetWidth()), 1, 4);
     }
 
     void addCommunityHost(Host host, Table container){
diff --git a/core/src/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java
index 043061c5a7..ce3867666b 100644
--- a/core/src/mindustry/world/blocks/power/Battery.java
+++ b/core/src/mindustry/world/blocks/power/Battery.java
@@ -12,7 +12,7 @@ import mindustry.world.draw.*;
 import mindustry.world.meta.*;
 
 public class Battery extends PowerDistributor{
-    public DrawBlock drawer;
+    public @Nullable DrawBlock drawer;
 
     public Color emptyLightColor = Color.valueOf("f8c266");
     public Color fullLightColor = Color.valueOf("fb9567");