diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 9bef6370c7..dc5b8748a2 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1294,7 +1294,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public void pickedUp(){
-
+        power.graph.removeList(self());
+        power.graph = new PowerGraph();
+        power.links.clear();
+        power.status = 0f;
     }
 
     public void removeFromProximity(){
diff --git a/core/src/mindustry/graphics/Layer.java b/core/src/mindustry/graphics/Layer.java
index 5ddea70282..cf465dc300 100644
--- a/core/src/mindustry/graphics/Layer.java
+++ b/core/src/mindustry/graphics/Layer.java
@@ -62,7 +62,7 @@ public class Layer{
     //flying units
     flyingUnit = 115,
 
-    //overlaied UI, like block config guides
+    //overlaid UI, like block config guides
     overlayUI = 120,
 
     //build beam effects
diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java
index c4cf8812db..41d56526fd 100644
--- a/core/src/mindustry/world/blocks/defense/ForceProjector.java
+++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java
@@ -122,6 +122,12 @@ public class ForceProjector extends Block{
             super.onRemoved();
         }
 
+        @Override
+        public void pickedUp(){
+            super.pickedUp();
+            radscl = warmup = 0f;
+        }
+
         @Override
         public void updateTile(){
             boolean phaseValid = consumes.get(ConsumeType.item).valid(this);
diff --git a/core/src/mindustry/world/blocks/payloads/BuildPayload.java b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
index 290c3856af..4b8454fd5c 100644
--- a/core/src/mindustry/world/blocks/payloads/BuildPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
@@ -91,10 +91,11 @@ public class BuildPayload implements Payload{
     public void draw(){
         drawShadow(1f);
         float prevZ = Draw.z();
-        Draw.zTransform(z -> 0.0011f + Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f));
+        Draw.zTransform(z -> z >= Layer.flyingUnitLow ? z : 0.0011f + Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f));
         build.tile = emptyTile;
         build.payloadDraw();
         Draw.zTransform();
+        Draw.z(prevZ);
     }
 
     @Override