diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 99b4f79633..2d32e621be 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2163,14 +2163,12 @@ public class Blocks implements ContentList{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
             alwaysUnlocked = true;
-            group = BlockGroup.units;
         }};
 
         payloadVoid = new PayloadVoid("payload-void"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
             alwaysUnlocked = true;
-            group = BlockGroup.units;
         }};
 
         //TODO move
diff --git a/core/src/mindustry/world/blocks/payloads/Constructor.java b/core/src/mindustry/world/blocks/payloads/Constructor.java
index 161a4e157a..9f5ddbdf03 100644
--- a/core/src/mindustry/world/blocks/payloads/Constructor.java
+++ b/core/src/mindustry/world/blocks/payloads/Constructor.java
@@ -6,6 +6,7 @@ import arc.scene.ui.layout.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
+import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.storage.*;
@@ -57,6 +58,17 @@ public class Constructor extends BlockProducer{
             ItemSelection.buildTable(Constructor.this, table, content.blocks().select(Constructor.this::canProduce), () -> recipe, this::configure);
         }
 
+        @Override
+        public boolean onConfigureTileTapped(Building other){
+            if(this == other){
+                deselect();
+                configure(null);
+                return false;
+            }
+
+            return true;
+        }
+
         @Override
         public Object config(){
             return recipe;
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadSource.java b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
index f035741ab7..03fc0eb320 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadSource.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
@@ -91,6 +91,17 @@ public class PayloadSource extends PayloadBlock{
             () -> (UnlockableContent)config(), this::configure);
         }
 
+        @Override
+        public boolean onConfigureTileTapped(Building other){
+            if(this == other){
+                deselect();
+                configure(null);
+                return false;
+            }
+
+            return true;
+        }
+
         @Override
         public Object config(){
             return unit == null ? block : unit;
diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index dd0c81cb06..882ccec5d6 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -166,6 +166,17 @@ public class UnitFactory extends UnitBlock{
             }
         }
 
+        @Override
+        public boolean onConfigureTileTapped(Building other){
+            if(this == other){
+                deselect();
+                configure(null);
+                return false;
+            }
+
+            return true;
+        }
+
         @Override
         public boolean acceptPayload(Building source, Payload payload){
             return false;
diff --git a/servers_v6.json b/servers_v6.json
index 0de119cb8f..5b5f51cf97 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -117,7 +117,7 @@
   },
   {
     "name": "MindustryBR",
-    "address": ["mindustryptbr.ddns.net", "mindustryptbr.myddns.me", "mindustry.me:4447"]
+    "address": ["mindustryptbr.ddns.net", "mindustryptbr.myddns.me", "n2.mindustry.me:4002", "n2.mindustry.me:4007"]
   },
   {
     "name": "Conservatory",
diff --git a/servers_v7.json b/servers_v7.json
index 4ee885dabd..a4f8be3454 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -65,6 +65,6 @@
   },
   {
     "name": "MindustryBR",
-    "address": ["mindustry.me:4451", "n2.mindustry.me:4446"]
+    "address": ["n2.mindustry.me:4003", "n2.mindustry.me:4005", "n2.mindustry.me:4008", "n2.mindustry.me:4009", "n2.mindustry.me:4010"]
   }
 ]