diff --git a/android/build.gradle b/android/build.gradle
index 3ae47de130..40582c5c7d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -46,7 +46,7 @@ task deploy(type: Copy){
 
     from "build/outputs/apk/release/android-release.apk"
     into "../deploy/"
-    rename ("android-google-release.apk", appName + "-android-" + getVersionString() + ".apk")
+    rename ("android-release.apk", appName + "-android-" + getVersionString() + ".apk")
 }
 
 android {
diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
index 8122d5f3b4..3cb66988bd 100644
--- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
@@ -213,8 +213,8 @@ public interface BuilderTrait extends Entity, TeamTrait{
 
         TileEntity core = unit.getClosestCore();
 
-        //if there is no core to build with, stop building!
-        if(core == null){
+        //if there is no core to build with or no build entity, stop building!
+        if(core == null || !(tile.entity instanceof BuildEntity)){
             return;
         }
 
diff --git a/core/src/io/anuke/mindustry/entities/type/TileEntity.java b/core/src/io/anuke/mindustry/entities/type/TileEntity.java
index 7a6ed1c040..872c4ab39b 100644
--- a/core/src/io/anuke/mindustry/entities/type/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/type/TileEntity.java
@@ -280,7 +280,9 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
 
         if(health <= 0){
             onDeath();
+            return; //no need to update anymore
         }
+
         Block previous = block;
         block.update(tile);
         if(block == previous && cons != null){
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
index 2f7232d957..45d87e6b2e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -199,7 +199,6 @@ public class Conveyor extends Block{
 
     @Override
     public void update(Tile tile){
-
         ConveyorEntity entity = tile.entity();
         entity.minitem = 1f;
         Tile next = tile.getNearby(tile.getRotation());