diff --git a/build.gradle.kts b/build.gradle.kts
index a208e540e..c8795df6c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ logger.lifecycle("""
  1) Read COMPILING.md if you haven't yet
  2) Try running 'build' in a separate Gradle run
  3) Use gradlew and not gradle
- 4) If you still need help, ask on Discord! https://discord.gg/enginehub
+ 4) If you still need help, ask on Discord! https://discord.gg/ngZCzbU
 
  Output files will be in [subproject]/build/libs
 *******************************************
diff --git a/splash.txt b/splash.txt
deleted file mode 100644
index 6513022a7..000000000
--- a/splash.txt
+++ /dev/null
@@ -1,21 +0,0 @@
- 
-============= You are compiling: =============
- _______    ___   ____    __    ____  _______
-|   ____|  /   \  \   \  /  \  /   / |   ____|
-|  |__    /  ^  \  \   \/    \/   /  |  |__
-|   __|  /  /_\  \  \            /   |   __|
-|  |    /  _____  \  \    /\    /    |  |____
-|__|   /__/     \__\  \__/  \__/     |_______|
-
-======== Authors https://git.io/fjIDU ========
-
-If you encounter trouble:
- - Run `build` in a separate Gradle run
- - Use gradlew and not gradle
- - Ask us!
-   - https://discord.gg/ngZCzbU (Discord)
-
-Files will be output to `/target`
-
-==============================================
-
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java
index 58d4f12bf..3c293f6f3 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java
@@ -19,10 +19,7 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.sk89q.worldedit.WorldEdit;
-
 import com.sk89q.worldedit.extension.platform.AbstractNonPlayerActor;
 import com.sk89q.worldedit.extension.platform.Locatable;
 import com.sk89q.worldedit.extent.Extent;
@@ -31,22 +28,24 @@ import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.auth.AuthorizationException;
 import com.sk89q.worldedit.util.formatting.WorldEditText;
 import com.sk89q.worldedit.util.formatting.text.Component;
-import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.adapter.bukkit.TextAdapter;
-import com.sk89q.worldedit.util.formatting.text.format.TextColor;
-import java.util.UUID;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.command.BlockCommandSender;
-
-import java.util.Locale;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.UUID;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class BukkitBlockCommandSender extends AbstractNonPlayerActor implements Locatable {
 
+    private static final String UUID_PREFIX = "CMD";
+
     private final BlockCommandSender sender;
     private final WorldEditPlugin plugin;
     private final Location location;
@@ -59,7 +58,7 @@ public class BukkitBlockCommandSender extends AbstractNonPlayerActor implements
         this.plugin = plugin;
         this.sender = sender;
         this.location = BukkitAdapter.adapt(sender.getBlock().getLocation());
-        this.uuid = new UUID(location.toVector().toBlockPoint().hashCode(), location.getExtent().hashCode());
+        this.uuid = UUID.nameUUIDFromBytes((UUID_PREFIX + sender.getName()).getBytes(StandardCharsets.UTF_8));
     }
 
     @Override
@@ -134,7 +133,6 @@ public class BukkitBlockCommandSender extends AbstractNonPlayerActor implements
     @Override
     public SessionKey getSessionKey() {
         return new SessionKey() {
-            @Nullable
             @Override
             public String getName() {
                 return sender.getName();
@@ -154,7 +152,7 @@ public class BukkitBlockCommandSender extends AbstractNonPlayerActor implements
 
             @Override
             public boolean isPersistent() {
-                return false;
+                return true;
             }
 
             @Override
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/FactoryConverter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/FactoryConverter.java
index d475c387c..5b880f726 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/FactoryConverter.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/FactoryConverter.java
@@ -27,6 +27,7 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Locatable;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
 import com.sk89q.worldedit.function.mask.Mask;
@@ -104,8 +105,8 @@ public class FactoryConverter<T> implements ArgumentConverter<T> {
 
         ParserContext parserContext = new ParserContext();
         parserContext.setActor(actor);
-        if (actor instanceof Entity) {
-            Extent extent = ((Entity) actor).getExtent();
+        if (actor instanceof Locatable) {
+            Extent extent = ((Locatable) actor).getExtent();
             if (extent instanceof World) {
                 parserContext.setWorld((World) extent);
             }
diff --git a/worldedit-logo.png b/worldedit-logo.png
deleted file mode 100644
index e0b515743..000000000
Binary files a/worldedit-logo.png and /dev/null differ