diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
index 13506b1cf..fa9f07476 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
@@ -26,7 +26,7 @@ public class Commandgamemode extends EssentialsLoopCommand {
         } else if (args.length == 1) {
             loopOnlinePlayersConsumer(server, sender, false, true, args[0], user -> setUserGamemode(sender, matchGameMode(commandLabel), user));
         } else if (args.length == 2) {
-            loopOnlinePlayersConsumer(server, sender, false, true, args[1], user -> setUserGamemode(sender, matchGameMode(commandLabel), user));
+            loopOnlinePlayersConsumer(server, sender, false, true, args[1], user -> setUserGamemode(sender, matchGameMode(args[0]), user));
         }
 
     }
@@ -85,6 +85,7 @@ public class Commandgamemode extends EssentialsLoopCommand {
 
     private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException {
         GameMode mode = null;
+        modeString = modeString.toLowerCase();
         if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc") || modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c")) {
             mode = GameMode.CREATIVE;
         } else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms") || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s")) {
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
index 1d9e2f7d2..2139a5d45 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
@@ -276,6 +276,11 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public boolean setSpawnLocation(int i, int i1, int i2, float v) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     @Override
     public boolean setSpawnLocation(int i, int i1, int i2) {
         throw new UnsupportedOperationException("Not supported yet.");
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 1e9973dbd..98136f01f 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -992,7 +992,7 @@ protect:
     # Which blocks should people be prevented from breaking?
     break:
 
-    # Which blocks should not be pushed by pistons?
+    # Which blocks should not be moved by pistons?
     piston:
 
     # Which blocks should not be dispensed by dispensers
diff --git a/providers/PaperProvider/pom.xml b/providers/PaperProvider/pom.xml
index 0307d6c46..aeaf38a65 100644
--- a/providers/PaperProvider/pom.xml
+++ b/providers/PaperProvider/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <version>1.16.1-R0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>