diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index a1121f4454..36b2e14bc2 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -40,7 +40,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
             if(pay instanceof BuildPayload pb && pb.build.power != null){
                 if(payloadPower == null) payloadPower = new PowerGraph();
 
-                pb.build.team = team;
+                //pb.build.team = team;
                 pb.build.power.graph = null;
                 payloadPower.add(pb.build);
             }
@@ -51,9 +51,10 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
         }
 
         for(Payload pay : payloads){
-            if(pay instanceof BuildPayload build){
-                build.build.team = team;
-            }
+            //apparently BasedUser doesn't want this and several plugins use it
+            //if(pay instanceof BuildPayload build){
+            //    build.build.team = team;
+            //}
             pay.set(x, y, rotation);
             pay.update(true);
         }
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 61787b96b4..062cc810d6 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -83,7 +83,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         moveAt(Tmp.v2.trns(rotation, vec.len()));
 
         if(!vec.isZero()){
-            rotation = Angles.moveToward(rotation, vec.angle(), type.rotateSpeed * Math.max(Time.delta, 1));
+            rotation = Angles.moveToward(rotation, vec.angle(), type.rotateSpeed * Time.delta);
         }
     }