diff --git a/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch b/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
index 81b8da3..614a2a4 100644
--- a/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
+++ b/BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
@@ -1,4 +1,4 @@
-From a16ac4f8fcae27f03ffc287a2063bbf6713ea053 Mon Sep 17 00:00:00 2001
+From 4eb927bb9546be184307fdeb39b011e07975c96d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 10:55:20 -0700
 Subject: [PATCH] Configurable Waterfall Metrics
@@ -17,19 +17,38 @@ index b30541b..293ec4e 100644
 +     */
 +    boolean isMetrics();
  }
+diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+index f9e277d..056b804 100644
+--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+@@ -9,10 +9,23 @@ import net.md_5.bungee.conf.YamlConfig;
+ 
+ public class WaterfallConfiguration extends Configuration {
+ 
++    /**
++     * If metrics is enabled
++     * <p>
++     * Default is true (enabled)
++     */
++    private boolean metrics = true;
++
+     @Override
+     public void load() {
+         super.load();
+         YamlConfig config = new YamlConfig(new File("waterfall.yml"));
+         config.load(false); // Load, but no permissions
++        metrics = config.getBoolean("metrics", metrics);
++    }
++
++    @Override
++    public boolean isMetrics() {
++        return metrics;
+     }
+ }
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 7bb0862..290fad4 100644
+index 7bb0862..a7dcc97 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -11,7 +11,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
- import com.google.gson.Gson;
- import com.google.gson.GsonBuilder;
- import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
--import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration;
-+import net.md_5.bungee.conf.WaterfallConfiguration;
- import io.netty.bootstrap.ServerBootstrap;
- import io.netty.channel.Channel;
- import io.netty.channel.ChannelException;
 @@ -289,7 +289,9 @@ public class BungeeCord extends ProxyServer
                  }
              }
@@ -62,43 +81,6 @@ index 9523987..e482e98 100644
  
          // Connect to the website
          URLConnection connection;
-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-similarity index 56%
-rename from proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-rename to proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-index f9e277d..38f6330 100644
---- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-@@ -1,4 +1,4 @@
--package io.github.waterfallmc.waterfall.conf;
-+package net.md_5.bungee.conf;
- 
- import lombok.*;
- 
-@@ -9,10 +9,23 @@ import net.md_5.bungee.conf.YamlConfig;
- 
- public class WaterfallConfiguration extends Configuration {
- 
-+    /**
-+     * If metrics is enabled
-+     * <p>
-+     * Default is true (enabled)
-+     */
-+    private boolean metrics = true;
-+
-     @Override
-     public void load() {
-         super.load();
-         YamlConfig config = new YamlConfig(new File("waterfall.yml"));
-         config.load(false); // Load, but no permissions
-+        metrics = config.getBoolean("metrics", metrics);
-+    }
-+
-+    @Override
-+    public boolean isMetrics() {
-+        return metrics;
-     }
- }
 -- 
 2.10.0
 
diff --git a/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch
index a62f659..1eeb8b4 100644
--- a/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch
+++ b/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch
@@ -1,4 +1,4 @@
-From a061441178978766c9aec812946d9cfcd74b56f6 Mon Sep 17 00:00:00 2001
+From d8a4843bb21d6878bf71cc1acff155ffce7d28e8 Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -22,10 +22,10 @@ index 293ec4e..66d0b8a 100644
 +     */
 +    int getTabThrottle();
  }
-diff --git a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-index 38f6330..6cfa96a 100644
---- a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+index 056b804..e56d359 100644
+--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 @@ -16,16 +16,36 @@ public class WaterfallConfiguration extends Configuration {
       */
      private boolean metrics = true;
diff --git a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
index 5ccd077..e8eccc7 100644
--- a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
@@ -1,4 +1,4 @@
-From b6e83ccf0aef5cbaee7a49b90f394460447e15a6 Mon Sep 17 00:00:00 2001
+From bb21405720f79a011d0d0c67cc9ce40d63739ddc Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Optional server list ping logging.
@@ -24,22 +24,10 @@ index 66d0b8a..5a49050 100644
      // Throttling options
  
      /**
-diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index ed057b8..a37f3ea 100644
---- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -382,6 +382,6 @@ public class ServerConnector extends PacketHandler
-     @Override
-     public String toString()
-     {
--        return "[" + user.getName() + "] <-> ServerConnector [" + target.getName() + "]";
-+        return "[" + user.getName() + "|" + user.getAddress() + "] <-> ServerConnector [" + target.getName() + "]";
-     }
- }
-diff --git a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-index 6cfa96a..a85f985 100644
---- a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+index e56d359..68f2546 100644
+--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 @@ -16,6 +16,13 @@ public class WaterfallConfiguration extends Configuration {
       */
      private boolean metrics = true;
@@ -72,6 +60,18 @@ index 6cfa96a..a85f985 100644
 +        return logServerListPing;
 +    }
  }
+diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+index ed057b8..a37f3ea 100644
+--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
++++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+@@ -382,6 +382,6 @@ public class ServerConnector extends PacketHandler
+     @Override
+     public String toString()
+     {
+-        return "[" + user.getName() + "] <-> ServerConnector [" + target.getName() + "]";
++        return "[" + user.getName() + "|" + user.getAddress() + "] <-> ServerConnector [" + target.getName() + "]";
+     }
+ }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 index c0a5061..4768cb4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
diff --git a/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch b/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch
index 75bb1d3..a4bf473 100644
--- a/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch
+++ b/BungeeCord-Patches/0034-Configurable-server-version-in-ping-response.patch
@@ -1,4 +1,4 @@
-From d10ad2d125b7af681733f793cbae4189e1caa692 Mon Sep 17 00:00:00 2001
+From 167338d235ef25f4c143f6b26348485ef90ea9c6 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 13:56:57 -0500
 Subject: [PATCH] Configurable server version in ping response
@@ -20,23 +20,10 @@ index f04e2bf..a443614 100644
      // Throttling options
  
      /**
-diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index f04e9c1..7e68902 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -612,7 +612,7 @@ public class BungeeCord extends ProxyServer
-     @Override
-     public String getGameVersion()
-     {
--        return Joiner.on( ", " ).join( ProtocolConstants.SUPPORTED_VERSIONS );
-+        return getConfig().getGameVersion(); // Waterfall
-     }
- 
-     @Override
-diff --git a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-index a85f985..9088182 100644
---- a/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
-+++ b/proxy/src/main/java/net/md_5/bungee/conf/WaterfallConfiguration.java
+diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+index 68f2546..5983581 100644
+--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
++++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 @@ -4,8 +4,11 @@ import lombok.*;
  
  import java.io.File;
@@ -70,6 +57,19 @@ index a85f985..9088182 100644
 +        gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
      }
  
+     @Override
+diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+index 239027d..2f8b16f 100644
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+@@ -612,7 +612,7 @@ public class BungeeCord extends ProxyServer
+     @Override
+     public String getGameVersion()
+     {
+-        return Joiner.on( ", " ).join( ProtocolConstants.SUPPORTED_VERSIONS );
++        return getConfig().getGameVersion(); // Waterfall
+     }
+ 
      @Override
 -- 
 2.10.0