diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 69ed270b04..7ab18ba121 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -729,7 +729,7 @@ mode.editor.name = Editor
 mode.pvp.name = PvP
 mode.pvp.description = Fight against other players locally.\n[gray]Requires at least 2 differently-colored cores in the map to play.
 mode.attack.name = Attack
-mode.attack.description = Destroy the enemy's base. No waves.\n[gray]Requires a red core in the map to play.
+mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
 mode.custom = Custom Rules
 
 rules.infiniteresources = Infinite Resources
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 45023deac8..9a31172660 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -280,6 +280,10 @@ public class BuildBlock extends Block{
 
             progress = Mathf.clamp(progress - amount);
 
+            if(builder instanceof Player){
+                builderID = builder.getID();
+            }
+
             if(progress <= 0 || state.rules.infiniteResources){
                 Call.onDeconstructFinish(tile, this.cblock == null ? previous : this.cblock, builderID);
             }
diff --git a/desktop/build.gradle b/desktop/build.gradle
index c9bc28a869..acf5e0ae79 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -28,6 +28,10 @@ task run(dependsOn: classes, type: JavaExec){
         args Eval.me(project.getProperties()["args"])
     }
 
+    if(project.hasProperty("jvmArgs")){
+        jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
+    }
+
     if(args.contains("debug")){
         main = "io.anuke.mindustry.DebugLauncher"
     }
diff --git a/server/build.gradle b/server/build.gradle
index 26fe08a653..31f6d57dc5 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -19,6 +19,9 @@ task run(dependsOn: classes, type: JavaExec){
     if(project.hasProperty("appArgs")){
         args Eval.me(appArgs)
     }
+    if(project.hasProperty("jvmArgs")){
+        jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
+    }
 }
 
 task debug(dependsOn: classes, type: JavaExec){