diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java
index de1bf08a..56f5536b 100644
--- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java
+++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java
@@ -24,8 +24,6 @@
 package cloud.commandframework.arguments.parser;
 
 import cloud.commandframework.arguments.standard.UUIDArgument;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.TypeToken;
 import cloud.commandframework.annotations.specifier.Completions;
 import cloud.commandframework.annotations.specifier.Range;
 import cloud.commandframework.arguments.standard.BooleanArgument;
@@ -107,8 +105,8 @@ public final class StandardParserRegistry<C> implements ParserRegistry<C> {
                 StringArgument.StringMode.SINGLE, (context, s) ->
                 Arrays.asList(options.get(StandardParameters.COMPLETIONS, new String[0]))));
         /* Add options to this */
-        this.registerParserSupplier(TypeToken.of(Boolean.class), options -> new BooleanArgument.BooleanParser<>(false));
-        this.registerParserSupplier(TypeToken.of(UUID.class), options -> new UUIDArgument.UUIDParser<>());
+        this.registerParserSupplier(TypeToken.get(Boolean.class), options -> new BooleanArgument.BooleanParser<>(false));
+        this.registerParserSupplier(TypeToken.get(UUID.class), options -> new UUIDArgument.UUIDParser<>());
     }
 
     @Override
diff --git a/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java b/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java
index eaf9bfa1..0d579a21 100644
--- a/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java
+++ b/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java
@@ -92,7 +92,7 @@ public final class BukkitTest extends JavaPlugin {
 
             final BukkitAudiences bukkitAudiences = BukkitAudiences.create(this);
             final MinecraftHelp<CommandSender> minecraftHelp = new MinecraftHelp<>("/cloud help",
-                                                                                   bukkitAudiences::sender,
+                                                                                   bukkitAudiences::audience,
                                                                                    mgr);
 
             try {
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
index d3fd7b86..cd97b820 100644
--- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
+++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java
@@ -92,9 +92,9 @@ public class BukkitCommandManager<C> extends CommandManager<C> {
         this.getParserRegistry().registerParserSupplier(TypeToken.get(Material.class),
                                                         params -> new MaterialArgument.MaterialParser<>());
         this.getParserRegistry()
-            .registerParserSupplier(TypeToken.of(Player.class), params -> new PlayerArgument.PlayerParser<>());
+            .registerParserSupplier(TypeToken.get(Player.class), params -> new PlayerArgument.PlayerParser<>());
         this.getParserRegistry()
-            .registerParserSupplier(TypeToken.of(OfflinePlayer.class),
+            .registerParserSupplier(TypeToken.get(OfflinePlayer.class),
                                     params -> new OfflinePlayerArgument.OfflinePlayerParser<>());
 
         /* Try to determine the Minecraft version */