diff --git a/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
index e3f965ea9..e43868ee9 100644
--- a/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
+++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
@@ -36,7 +36,7 @@ public class AddonClassLoader extends URLClassLoader {
             MalformedURLException,
             InvalidDescriptionException,
             InstantiationException,
-            IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
+            IllegalAccessException, InvocationTargetException, NoSuchMethodException {
         super(new URL[]{path.toURI().toURL()}, parent);
 
         loader = addonsManager;
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java
index 32c3a24a7..777175fc3 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminWhyCommand.java
@@ -7,6 +7,7 @@ import java.util.UUID;
 
 import org.bukkit.metadata.FixedMetadataValue;
 
+import org.bukkit.metadata.MetadataValue;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -47,7 +48,7 @@ public class AdminWhyCommand extends ConfirmableCommand {
         }
         // Determine the debug mode and toggle if required
         boolean newValue = !target.getPlayer().getMetadata(getWorld().getName() + "_why_debug").stream()
-                .filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(p -> p.asBoolean()).orElse(false);
+                .filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(MetadataValue::asBoolean).orElse(false);
         if (newValue) {
             user.sendMessage("commands.admin.why.turning-on", TextVariables.NAME, target.getName());
         } else {
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/schem/AdminSchemCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/schem/AdminSchemCommand.java
index 4dc7c553f..82230f802 100644
--- a/src/main/java/world/bentobox/bentobox/api/commands/admin/schem/AdminSchemCommand.java
+++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/schem/AdminSchemCommand.java
@@ -20,8 +20,8 @@ public class AdminSchemCommand extends ConfirmableCommand {
 
     // Map containing selection cuboid display tasks
     private Map<User, Integer> display;
-    private final Particle PARTICLE = Particle.REDSTONE;
-    private final Particle.DustOptions PARTICLE_DUST_OPTIONS = new Particle.DustOptions(Color.RED, 1.0F);
+    private static final Particle PARTICLE = Particle.REDSTONE;
+    private static final Particle.DustOptions PARTICLE_DUST_OPTIONS = new Particle.DustOptions(Color.RED, 1.0F);
 
     public AdminSchemCommand(CompositeCommand parent) {
         super(parent, "schem");
diff --git a/src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java b/src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java
index 8cb5757ab..0914301a1 100644
--- a/src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java
+++ b/src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java
@@ -9,6 +9,7 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
 
+import org.bukkit.metadata.MetadataValue;
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
@@ -30,7 +31,6 @@ public abstract class AbstractFlagListener implements Listener {
      *
      */
     enum Why {
-
         UNPROTECTED_WORLD,
         OP,
         BYPASS_EVERYWHERE,
@@ -226,9 +226,9 @@ public abstract class AbstractFlagListener implements Listener {
 
     private void report(User user, Event e, Location loc, Flag flag, Why why) {
         if (user != null && user.getPlayer().getMetadata(loc.getWorld().getName() + "_why_debug").stream()
-                .filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(p -> p.asBoolean()).orElse(false)) {
+                .filter(p -> p.getOwningPlugin().equals(getPlugin())).findFirst().map(MetadataValue::asBoolean).orElse(false)) {
             plugin.log("Why: " + e.getEventName() + " in world " + loc.getWorld().getName() + " at " + Util.xyz(loc.toVector()));
-            plugin.log("Why: " + (user == null ? "Unknown" : user.getName()) + " " + flag.getID() + " - " + why.name());
+            plugin.log("Why: " + user.getName() + " " + flag.getID() + " - " + why.name());
         }
 
     }
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
index 92856e29e..3c2be587a 100644
--- a/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
@@ -106,7 +106,7 @@ public class IslandWorldManager {
      */
     public Map<String, String> getOverWorldNames() {
         return worldSettings.values().stream()
-                .collect(Collectors.toMap(ws -> ws.getWorldName(), ws -> ws.getAddon().map(a -> a.getDescription().getName()).orElse("None")));
+                .collect(Collectors.toMap(WorldSettings::getWorldName, ws -> ws.getAddon().map(a -> a.getDescription().getName()).orElse("None")));
     }
 
     /**