diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index 150b6ac776..68e2403d1a 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -278,6 +278,7 @@ public class Renderer extends RendererModule{
         drawAndInterpolate(playerGroup, p -> !p.isDead() && !p.isLocal, Player::drawName);
         EntityDraw.setClip(true);
         Graphics.end();
+        Draw.color();
     }
 
     private void drawFlyerShadows(){
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index c0b4059e03..a6c4f9f599 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -53,8 +53,8 @@ public class BuildBlock extends Block{
 
     @Remote(called = Loc.server)
     public static void onConstructFinish(Tile tile, Block block, int builderID, byte rotation, Team team){
-        world.setBlock(tile, block, team);
         tile.setRotation(rotation);
+        world.setBlock(tile, block, team);
         tile.setTeam(team);
         Effects.effect(Fx.placeBlock, tile.drawx(), tile.drawy(), block.size);