diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java
index de2fe755df..0fabcc5ce8 100644
--- a/core/src/mindustry/core/ContentLoader.java
+++ b/core/src/mindustry/core/ContentLoader.java
@@ -33,7 +33,7 @@ public class ContentLoader{
 
     public ContentLoader(){
         for(ContentType type : ContentType.all){
-            contentMap[type.ordinal()] = new Seq<>(type.contentClass == null ? Object.class : type.contentClass);
+            contentMap[type.ordinal()] = new Seq<>();
             contentNameMap[type.ordinal()] = new ObjectMap<>();
         }
     }
diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index ca4b0e13ce..3f4157abcf 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1005,7 +1005,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         int dump = this.cdump;
         var allItems = content.items();
         int itemSize = allItems.size;
-        Item[] itemArray = allItems.items;
+        Object[] itemArray = allItems.items;
 
         for(int i = 0; i < proximity.size; i++){
             Building other = proximity.get((i + dump) % proximity.size);
@@ -1014,7 +1014,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
                 for(int ii = 0; ii < itemSize; ii++){
                     if(!items.has(ii)) continue;
-                    Item item = itemArray[ii];
+                    Item item = (Item)itemArray[ii];
 
                     if(other.acceptItem(self(), item) && canDump(other, item)){
                         other.handleItem(self(), item);