diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Add.java b/src/main/java/com/intellectualcrafters/plot/commands/Add.java
index 6ae047878..e3926e49b 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Add.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Add.java
@@ -72,14 +72,11 @@ public class Add extends SubCommand {
         if (args[0].equalsIgnoreCase("*")) {
             uuid = DBFunc.everyone;
         } else {
+            // TODO have a runnable for fetch
             uuid = UUIDHandler.getUUID(args[0], null);
         }
         if (uuid == null) {
-            if (UUIDHandler.implementation instanceof SQLUUIDHandler) {
-                MainUtil.sendMessage(plr, C.INVALID_PLAYER_WAIT, args[0]);
-            } else {
-                MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
-            }
+            MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
         if (plot.isOwner(uuid)) {
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Comment.java b/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
index d53d7d1d6..aa87d24bb 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
@@ -40,7 +40,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
         description = "Comment on a plot",
         category = CommandCategory.ACTIONS,
         requiredType = RequiredType.NONE,
-        permission = "plot.comment"
+        permission = "plots.comment"
 )
 public class Comment extends SubCommand {
 
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java b/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
index 22f5003aa..d08d7d4aa 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
@@ -42,7 +42,6 @@ public class Unclaim extends SubCommand {
 
     @Override
     public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
         if (plot == null) {
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java
index 766a012d1..a4eb7a1f4 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java
@@ -38,7 +38,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
 @CommandDeclaration(
         command = "untrust",
         aliases = {"ut"},
-        permission = "plot.untrust",
+        permission = "plots.untrust",
         description = "Remove a trusted user from a plot",
         usage = "/plot untrust <player>",
         requiredType = RequiredType.NONE,