diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b6f8e76b14..02d3820bc4 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -363,7 +363,7 @@ public class Blocks implements ContentList{
 
         sandWall = new StaticWall("sand-wall"){{
             variants = 2;
-            sandWater.asFloor().wall = this;
+            sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = this;
         }};
 
         saltWall = new StaticWall("salt-wall");
diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index 1c06372731..d5afac1217 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -146,6 +146,7 @@ public class Teams{
 
     public void updateTeamStats(){
         present.clear();
+        boss = null;
 
         for(Team team : Team.all){
             TeamData data = team.data();