diff --git a/core/src/mindustry/entities/EntityCollisions.java b/core/src/mindustry/entities/EntityCollisions.java
index 2bf034b95b..7343b7ff59 100644
--- a/core/src/mindustry/entities/EntityCollisions.java
+++ b/core/src/mindustry/entities/EntityCollisions.java
@@ -16,11 +16,8 @@ public class EntityCollisions{
     private static final float seg = 1f;
 
     //tile collisions
-    private Rect tmp = new Rect();
-    private Vec2 vector = new Vec2();
-    private Vec2 l1 = new Vec2();
-    private Rect r1 = new Rect();
-    private Rect r2 = new Rect();
+    private Vec2 vector = new Vec2(), l1 = new Vec2();
+    private Rect r1 = new Rect(), r2 = new Rect(), tmp = new Rect();
 
     //entity collisions
     private Seq<Hitboxc> arrOut = new Seq<>(Hitboxc.class);
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 99e9785ec6..b0d26ae353 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -1020,7 +1020,7 @@ public class UnitType extends UnlockableContent{
         //find reconstructor
         var rec = (Reconstructor)content.blocks().find(b -> b instanceof Reconstructor re && re.upgrades.contains(u -> u[1] == this));
 
-        if(rec != null && Structs.find(rec.consumers, i -> i instanceof ConsumeItems) instanceof ConsumeItems ci){
+        if(rec != null && rec.findConsumer(i -> i instanceof ConsumeItems) instanceof ConsumeItems ci){
             if(prevReturn != null){
                 prevReturn[0] = rec.upgrades.find(u -> u[1] == this)[0];
             }