diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
index 545b3d91c..aa5e4729d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
@@ -81,7 +81,7 @@ public class Claim extends SubCommand {
             }
             if (world instanceof HybridPlotWorld) {
                 final HybridPlotWorld pW = (HybridPlotWorld) world;
-                if (pW.CLAIMED_WALL_BLOCK != pW.WALL_BLOCK) {
+                if (!(pW.CLAIMED_WALL_BLOCK.equals(pW.WALL_BLOCK))) {
                     PlotMain.getPlotManager(plot.getWorld()).setWall(plot.getWorld(), world, plot.getId(), pW.CLAIMED_WALL_BLOCK);
                     if (PlotHelper.canSetFast) {
                         SetBlockFast.update(player);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
index 7965f5912..9ca0721ec 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
@@ -202,7 +202,7 @@ public class FlagCmd extends SubCommand {
                     PlayerFunctions.sendMessage(player, C.NO_PERMISSION, "plots.flag.list");
                     return false;
                 }
-                if (args.length != 3) {
+                if (args.length != 1) {
                     PlayerFunctions.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag list");
                     return false;
                 }