diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav
index 95c75030c1..53dd6935f2 100644
Binary files a/core/assets/maps/fungalPass.msav and b/core/assets/maps/fungalPass.msav differ
diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java
index a3c3d9070b..ce8b5ae92d 100644
--- a/core/src/mindustry/ai/types/BuilderAI.java
+++ b/core/src/mindustry/ai/types/BuilderAI.java
@@ -130,6 +130,6 @@ public class BuilderAI extends AIController{
 
     @Override
     public boolean shouldShoot(){
-        return !((Builderc)unit).isBuilding();
+        return !unit.isBuilding();
     }
 }
diff --git a/core/src/mindustry/ai/types/FlyingAI.java b/core/src/mindustry/ai/types/FlyingAI.java
index bf7367731d..6c2507ca5a 100644
--- a/core/src/mindustry/ai/types/FlyingAI.java
+++ b/core/src/mindustry/ai/types/FlyingAI.java
@@ -12,7 +12,7 @@ public class FlyingAI extends AIController{
     @Override
     public void updateMovement(){
         if(target != null && unit.hasWeapons() && command() == UnitCommand.attack){
-            if(unit.type.weapons.first().rotate){
+            if(unit.type.circleTarget){
                 moveTo(target, unit.range() * 0.8f);
                 unit.lookAt(target);
             }else{
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index d371f63202..d1a771621e 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -918,6 +918,7 @@ public class UnitTypes implements ContentList{
             range = 140f;
             targetAir = false;
             commandLimit = 4;
+            circleTarget = true;
 
             weapons.add(new Weapon(){{
                 y = 0f;
@@ -950,6 +951,7 @@ public class UnitTypes implements ContentList{
             armor = 3f;
             targetFlag = BlockFlag.factory;
             commandLimit = 5;
+            circleTarget = true;
 
             weapons.add(new Weapon(){{
                 minShootVelocity = 0.75f;
diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 8eeb50200e..00d4096e78 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -335,8 +335,6 @@ public class Control implements ApplicationListener, Loadable{
                         state.wave = 1;
                         //set up default wave time
                         state.wavetime = state.rules.waveSpacing * 2f;
-                        //slightly increase wave spacing as a handicap
-                        state.rules.waveSpacing += 60f * 10;
                         //reset captured state
                         sector.info.wasCaptured = false;
                         //re-enable waves
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index fc32ec7bbc..3b42f7b61a 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -46,7 +46,7 @@ public class UnitType extends UnlockableContent{
     public float health = 200f, range = -1, armor = 0f, maxRange = -1f;
     public float crashDamageMultiplier = 1f;
     public boolean targetAir = true, targetGround = true;
-    public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false;
+    public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false, circleTarget = true;
     public boolean canBoost = false;
     public boolean destructibleWreck = true;
     public float groundLayer = Layer.groundUnit;