diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java
index ff57627c33..ccbe64b7c6 100644
--- a/core/src/mindustry/ai/types/BuilderAI.java
+++ b/core/src/mindustry/ai/types/BuilderAI.java
@@ -160,7 +160,7 @@ public class BuilderAI extends AIController{
                     float minDst = Float.MAX_VALUE;
                     Player closest = null;
                     for(var player : Groups.player){
-                        if(player.unit().canBuild() && !player.dead() && player.team() == unit.team){
+                        if(!player.dead() && player.isBuilder() && player.team() == unit.team){
                             float dst = player.dst2(unit);
                             if(dst < minDst){
                                 closest = player;
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index 86e635c357..1fc15522d1 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -572,7 +572,7 @@ public class DesktopInput extends InputHandler{
             player.unit().mineTile = null;
         }
 
-        if(Core.input.keyTap(Binding.clear_building)){
+        if(Core.input.keyTap(Binding.clear_building) && !player.dead()){
             player.unit().clearBuilding();
         }
 
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index 7e1f78b217..70a1d15279 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -913,7 +913,7 @@ public class HudFragment{
 
         table.table().update(t -> {
             t.left();
-            Bits applied = player.unit() == null ? null : player.unit().statusBits();
+            Bits applied = player.dead() ? null : player.unit().statusBits();
             if(!statuses.equals(applied)){
                 t.clear();
 
diff --git a/gradle.properties b/gradle.properties
index a87b03065c..827c8445c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=b857594d11
+archash=96cd86d08a