diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java
index 9e7bfb75d..064cc3548 100644
--- a/src/main/java/world/bentobox/bentobox/BentoBox.java
+++ b/src/main/java/world/bentobox/bentobox/BentoBox.java
@@ -106,7 +106,7 @@ public class BentoBox extends JavaPlugin {
             return;
         }
         islandsManager = new IslandsManager(this);
-        ranksManager = new RanksManager(this);
+        ranksManager = new RanksManager();
 
         // Start head getter
         headGetter = new HeadGetter(this);
diff --git a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
index 75a2a8b2d..173211d40 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
@@ -85,7 +85,7 @@ public class JoinLeaveListener implements Listener {
                     OfflinePlayer owner = Bukkit.getOfflinePlayer(island.getOwner());
 
                     // Converting the setting (in days) to milliseconds.
-                    long inactivityThreshold = plugin.getSettings().getAutoOwnershipTransferInactivityThreshold() * 24 * 60 * 60 * 1000;
+                    long inactivityThreshold = plugin.getSettings().getAutoOwnershipTransferInactivityThreshold() * 24 * 60 * 60 * 1000L;
                     long timestamp = System.currentTimeMillis() - inactivityThreshold;
 
                     // We make sure the current owner is inactive.
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java
index 80de5d705..f9b2c430c 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java
@@ -24,11 +24,10 @@ public class BlockInteractionListener extends FlagListener {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerInteract(final PlayerInteractEvent e) {
         // For some items, we need to do a specific check for RIGHT_CLICK_BLOCK
-        if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
-            if (e.getClickedBlock().getType().equals(Material.ITEM_FRAME)) {
-                checkIsland(e, e.getClickedBlock().getLocation(), Flags.ITEM_FRAME);
-                return;
-            }
+        if (e.getAction().equals(Action.RIGHT_CLICK_BLOCK)
+                && e.getClickedBlock().getType().equals(Material.ITEM_FRAME)) {
+            checkIsland(e, e.getClickedBlock().getLocation(), Flags.ITEM_FRAME);
+            return;
         }
 
         // Otherwise, we just don't care about the RIGHT_CLICK_BLOCK action.
diff --git a/src/main/java/world/bentobox/bentobox/managers/RanksManager.java b/src/main/java/world/bentobox/bentobox/managers/RanksManager.java
index 1cc8b0772..75e5016b1 100644
--- a/src/main/java/world/bentobox/bentobox/managers/RanksManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/RanksManager.java
@@ -29,17 +29,11 @@ public class RanksManager {
     public static final int VISITOR_RANK = 0;
     public static final int BANNED_RANK = -1;
 
-    private BentoBox plugin;
-
     // The store of ranks
     private LinkedHashMap<String, Integer> ranks = new LinkedHashMap<>();
 
-    /**
-     * @param plugin - plugin object
-     */
-    public RanksManager(BentoBox plugin) {
+    public RanksManager() {
         super();
-        this.plugin = plugin;
         // Hard coded ranks
         ranksPut(ADMIN_RANK_REF, ADMIN_RANK);
         ranksPut(MOD_RANK_REF, MOD_RANK);
diff --git a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
index 6fb7aacea..d6812ac23 100644
--- a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
@@ -31,9 +31,7 @@ public class RanksManagerTest {
      */
     @Before
     public void setUp() throws Exception {
-        BentoBox plugin = mock(BentoBox.class);
-
-        ranksManager = new RanksManager(plugin);
+        ranksManager = new RanksManager();
     }
 
     /**