diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java
index 0a319e300..f165f849a 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommand.java
@@ -44,11 +44,11 @@ public class AdminRangeSetCommand extends CompositeCommand {
         }
 
         // Get new range
-        if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
+        if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
             user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
             return false;
         }
-        int range = Integer.valueOf(args.get(1));
+        int range = Integer.parseInt(args.get(1));
 
         // Get island
         Island island = getIslands().getIsland(getWorld(), targetUUID);
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java
index ffe0b0c70..4fe4a3f6f 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java
@@ -151,15 +151,14 @@ public class BreakBlocksListener extends FlagListener {
         }
 
         // Find out who fired the arrow
-        if (e.getEntity().getShooter() instanceof Player) {
-            if (!checkIsland(e, (Player) e.getEntity().getShooter(), e.getHitBlock().getLocation(), Flags.BREAK_BLOCKS)) {
-                final BlockData data = e.getHitBlock().getBlockData();
-                // We seemingly can't prevent the block from being destroyed
-                // So we need to put it back with a slight delay (yup, this is hacky - it makes the block flicker sometimes)
-                e.getHitBlock().setType(Material.AIR); // prevents the block from dropping a chorus flower
-                getPlugin().getServer().getScheduler().runTask(getPlugin(), () -> e.getHitBlock().setBlockData(data, true));
-                // Sorry, this might also cause some ghost blocks!
-            }
+        if (e.getEntity().getShooter() instanceof Player &&
+                !checkIsland(e, (Player) e.getEntity().getShooter(), e.getHitBlock().getLocation(), Flags.BREAK_BLOCKS)) {
+            final BlockData data = e.getHitBlock().getBlockData();
+            // We seemingly can't prevent the block from being destroyed
+            // So we need to put it back with a slight delay (yup, this is hacky - it makes the block flicker sometimes)
+            e.getHitBlock().setType(Material.AIR); // prevents the block from dropping a chorus flower
+            getPlugin().getServer().getScheduler().runTask(getPlugin(), () -> e.getHitBlock().setBlockData(data, true));
+            // Sorry, this might also cause some ghost blocks!
         }
     }
 }
diff --git a/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java
index bc0947a4c..bf49c8dd3 100644
--- a/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java
+++ b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java
@@ -32,7 +32,6 @@ class IslandGrid {
                 if (firstLoaded.getOwner() == null && island.getOwner() != null) {
                     // This looks fishy. We prefer to load islands that have an owner. Swap the two
                     plugin.logError("Duplicate island has an owner, so using that one. " + island.getOwner());
-                    Island clone = new Island(firstLoaded);
                     firstLoaded = new Island(island);
                     zEntry.put(island.getMinZ(), firstLoaded);
                 } else if (firstLoaded.getOwner() != null && island.getOwner() != null) {
@@ -42,7 +41,6 @@ class IslandGrid {
                         if (firstLoaded.getCreatedDate() > island.getCreatedDate()) {
                             plugin.logError("Same owner duplicate. Swaping based on creation date.");
                             // FirstLoaded is the newer
-                            Island clone = new Island(firstLoaded);
                             firstLoaded = new Island(island);
                             zEntry.put(island.getMinZ(), firstLoaded);
                         } else {