diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index e7c5fd3914..31d37faf98 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1897,7 +1897,7 @@ public class Blocks{
 
         ductUnloader = new DirectionalUnloader("duct-unloader"){{
             requirements(Category.distribution, with(Items.graphite, 20, Items.silicon, 20, Items.tungsten, 10));
-            health = 90;
+            health = 120;
             speed = 4f;
             regionRotated1 = 1;
         }};
diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java
index f4d99253ff..a44b9abb52 100644
--- a/core/src/mindustry/content/Planets.java
+++ b/core/src/mindustry/content/Planets.java
@@ -65,6 +65,8 @@ public class Planets{
             hiddenItems.addAll(Items.serpuloItems).removeAll(Items.erekirItems);
             ruleSetter = r -> {
                 r.placeRangeCheck = true;
+                r.attributes.set(Attribute.heat, 0.8f);
+                r.showSpawns = true;
             };
 
             unlockedOnLand.add(Blocks.coreBastion);
@@ -107,6 +109,11 @@ public class Planets{
             allowWaveSimulation = true;
             allowSectorInvasion = true;
             allowLaunchSchematics = true;
+            ruleSetter = r -> {
+                r.placeRangeCheck = false;
+                r.attributes.clear();
+                r.showSpawns = false;
+            };
             defaultAI = true;
             atmosphereColor = Color.valueOf("3c1b8f");
             atmosphereRadIn = 0.02f;
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index fd22b8014b..ce2977b9ef 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -213,7 +213,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         for(int id : unitIds){
             Unit unit = Groups.unit.getByID(id);
-            if(unit.team == player.team() && unit.controller() instanceof CommandAI ai){
+            if(unit != null && unit.team == player.team() && unit.controller() instanceof CommandAI ai){
                 if(teamTarget != null && teamTarget.team() != player.team()){
                     ai.commandTarget(teamTarget);
                 }else if(posTarget != null){
diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
index c78709ada2..768626e6d7 100644
--- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
@@ -442,7 +442,6 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
         decoration(0.017f);
 
         //it is very hot
-        state.rules.attributes.set(Attribute.heat, 0.8f);
         state.rules.env = sector.planet.defaultEnv;
         state.rules.placeRangeCheck = true;