diff --git a/patches/server/0047-Make-the-GUI-better.patch b/patches/server/0047-Make-the-GUI-better.patch
index 9031122ec..5b92449d0 100644
--- a/patches/server/0047-Make-the-GUI-better.patch
+++ b/patches/server/0047-Make-the-GUI-better.patch
@@ -1,10 +1,10 @@
-From d226ac792c3774445ba8565c1a0a14ad789a84c9 Mon Sep 17 00:00:00 2001
+From 77672060f4f578b9019cfb1b7452fd03a0d8dd0a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 16 Jan 2020 14:59:16 -0600
 Subject: [PATCH] Make the GUI better
 
 ---
- .../net/minecraft/server/DedicatedServer.java |   8 +-
+ .../net/minecraft/server/DedicatedServer.java |   9 +-
  .../net/minecraft/server/MinecraftServer.java |   1 +
  .../java/net/pl3x/purpur/gui/ServerGUI.java   | 123 +++++++++++++++
  .../purpur/gui/console/JColorTextPane.java    |  81 ++++++++++
@@ -22,7 +22,7 @@ Subject: [PATCH] Make the GUI better
  .../net/pl3x/purpur/gui/util/GUIColor.java    |  54 +++++++
  .../purpur/util/HighlightErrorConverter.java  |  86 +++++++++++
  src/main/resources/log4j2.xml                 |  13 +-
- 18 files changed, 1003 insertions(+), 6 deletions(-)
+ 18 files changed, 1005 insertions(+), 5 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/gui/ServerGUI.java
  create mode 100644 src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
  create mode 100644 src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
@@ -40,10 +40,19 @@ Subject: [PATCH] Make the GUI better
  create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8c7156bb52..0d69c06c44 100644
+index 8c7156bb52..14df148717 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -51,7 +51,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
+ import com.mojang.authlib.minecraft.MinecraftSessionService;
+ import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+ import com.mojang.datafixers.DataFixer;
++
++import java.awt.GraphicsEnvironment;
+ import java.io.BufferedReader;
+ import java.io.File;
+ import java.io.IOException;
+@@ -51,7 +53,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      public DedicatedServerSettings propertyManager;
      private EnumGamemode o;
      @Nullable
@@ -52,16 +61,15 @@ index 8c7156bb52..0d69c06c44 100644
  
      // CraftBukkit start - Signature changed
      public DedicatedServer(joptsimple.OptionSet options, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
-@@ -87,7 +87,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -87,6 +89,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
                      return;
                  }
                  // Paper start - Use TerminalConsoleAppender
--                new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
-+                try { new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start(); } catch (Exception ignore) {} // Purpur
++                if (DedicatedServer.this.p == null) // Purpur
+                 new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
                  /*
                  jline.console.ConsoleReader bufferedreader = reader;
- 
-@@ -421,7 +421,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -421,7 +424,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      @Override
      public void exit() {
          if (this.p != null) {
@@ -70,7 +78,7 @@ index 8c7156bb52..0d69c06c44 100644
          }
  
          if (this.remoteControlListener != null) {
-@@ -520,7 +520,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -520,7 +523,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
      public void bc() {
          if (this.p == null) {
diff --git a/patches/server/0095-UPnP-Port-Forwarding-Service.patch b/patches/server/0095-UPnP-Port-Forwarding-Service.patch
index da8ddfa60..a37df006d 100644
--- a/patches/server/0095-UPnP-Port-Forwarding-Service.patch
+++ b/patches/server/0095-UPnP-Port-Forwarding-Service.patch
@@ -1,4 +1,4 @@
-From d1e6aa9e97612cc4cce15eeef26cfea4a4c575cf Mon Sep 17 00:00:00 2001
+From 7ddc912749df96d77a45e60077b4ac8991bb55b8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service
@@ -42,10 +42,10 @@ index 90ca354c46..e8c0974b64 100644
  
      <pluginRepositories>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 5337c0be08..757f892e8f 100644
+index 14df148717..cdc5a0115d 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -239,6 +239,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -242,6 +242,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }