diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 0531fe4eb6..ae8ea58056 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -291,6 +291,7 @@ public class ContentParser{
 
                 if(value.has("controller")){
                     unit.defaultController = supply(resolve(value.getString("controller"), FlyingAI.class));
+                    value.remove("controller");
                 }
 
                 //read extra default waves
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index 8767554939..09cb9288b5 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -52,6 +52,7 @@ public class CoreBlock extends StorageBlock{
         loopSoundVolume = 1f;
         group = BlockGroup.none;
         drawDisabled = false;
+        canOverdrive = false;
     }
 
     @Remote(called = Loc.server)