diff --git a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java
index aebe7ccc8..f6ec09edf 100644
--- a/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java
+++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java
@@ -1,5 +1,6 @@
 package world.bentobox.bentobox.api.panels.builders;
 
+import java.util.SortedMap;
 import java.util.TreeMap;
 
 import org.bukkit.ChatColor;
@@ -16,7 +17,7 @@ import world.bentobox.bentobox.api.user.User;
  */
 public class PanelBuilder {
     private String name;
-    private final TreeMap<Integer, PanelItem> items = new TreeMap<>();
+    private final SortedMap<Integer, PanelItem> items = new TreeMap<>();
     private int size;
     private User user;
     private PanelListener listener;
@@ -120,7 +121,7 @@ public class PanelBuilder {
     /**
      * @return the items
      */
-    public TreeMap<Integer, PanelItem> getItems() {
+    public SortedMap<Integer, PanelItem> getItems() {
         return items;
     }
 
diff --git a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java
index 3b1947593..f3fabdf64 100644
--- a/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java
+++ b/src/main/java/world/bentobox/bentobox/blueprints/BlueprintPaster.java
@@ -254,7 +254,6 @@ public class BlueprintPaster {
             // Center, and just a bit high
             Location center = location.add(new Vector(0.5, 0.5, 0.5));
             LivingEntity e = (LivingEntity)location.getWorld().spawnEntity(center, k.getType());
-            if (e == null) return;
             if (k.getCustomName() != null) {
                 e.setCustomName(k.getCustomName());
             }
diff --git a/src/main/java/world/bentobox/bentobox/database/objects/Island.java b/src/main/java/world/bentobox/bentobox/database/objects/Island.java
index 48d25772d..05bbdea0c 100644
--- a/src/main/java/world/bentobox/bentobox/database/objects/Island.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/Island.java
@@ -214,6 +214,7 @@ public class Island implements DataObject {
         this.world = island.world;
         this.cooldowns = island.cooldowns;
         this.commandRanks = island.commandRanks;
+        this.reserved = island.reserved;
     }
 
     /*
diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
index bb887b12c..652f3fc3c 100644
--- a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
@@ -153,6 +153,7 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                 continue;
             }
             // Get the getter and setters for this field using the JavaBeans system
+            //noinspection RedundantCast
             PropertyDescriptor propertyDescriptor = new PropertyDescriptor((String)field.getName(), dataObject);
             // Get the write method
             Method method = propertyDescriptor.getWriteMethod();
@@ -344,6 +345,7 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                 continue;
             }
             // Get the property descriptor for this field
+            //noinspection RedundantCast
             PropertyDescriptor propertyDescriptor = new PropertyDescriptor((String)field.getName(), dataObject);
             // Get the read method
             Method method = propertyDescriptor.getReadMethod();
diff --git a/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java
index e3d3c1107..73e9297a9 100644
--- a/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java
@@ -50,6 +50,7 @@ public class CommandsManager {
         try {
             @SuppressWarnings("unchecked")
             Map<String, Command> knownCommands = (Map<String, Command>) commandMap.getClass().getMethod("getKnownCommands").invoke(commandMap);
+            //noinspection SuspiciousMethodCalls
             knownCommands.values().removeIf(commands.values()::contains);
             // Not sure if this is needed, but it clears out all references
             commands.values().forEach(c -> c.unregister(commandMap));
diff --git a/src/main/java/world/bentobox/bentobox/schems/Converter.java b/src/main/java/world/bentobox/bentobox/schems/Converter.java
index 94bd6c9a1..f4f1a6db8 100644
--- a/src/main/java/world/bentobox/bentobox/schems/Converter.java
+++ b/src/main/java/world/bentobox/bentobox/schems/Converter.java
@@ -64,9 +64,7 @@ public class Converter {
                     .map(this::convertLegacyEntity)
                     // Collect into a map
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-            if (le != null) {
-                bp.setEntities(le);
-            }
+            bp.setEntities(le);
         }
         // Attached blocks
         if (bc.isConfigurationSection(ATTACHED_YAML_PREFIX)) {
diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java
index 8a4268399..0415da409 100644
--- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java
+++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java
@@ -67,9 +67,9 @@ import world.bentobox.bentobox.util.Util;
 @PrepareForTest( {BentoBox.class, Flags.class, Util.class, Bukkit.class} )
 public class TNTListenerTest {
 
-    private static Location location;
-    private static BentoBox plugin;
-    private static Notifier notifier;
+    private Location location;
+    private BentoBox plugin;
+    private Notifier notifier;
 
     @Before
     public void setUp() {