diff --git a/src/main/java/world/bentobox/limits/Settings.java b/src/main/java/world/bentobox/limits/Settings.java
index c781c33..7a7a98b 100644
--- a/src/main/java/world/bentobox/limits/Settings.java
+++ b/src/main/java/world/bentobox/limits/Settings.java
@@ -1,6 +1,7 @@
 package world.bentobox.limits;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@@ -70,7 +71,7 @@ public class Settings {
      * @return the limits
      */
     public Map<EntityType, Integer> getLimits() {
-        return limits;
+        return Collections.unmodifiableMap(limits);
     }
 
     /**
diff --git a/src/main/java/world/bentobox/limits/commands/LimitPanel.java b/src/main/java/world/bentobox/limits/commands/LimitPanel.java
index c3d3613..07d5fcd 100644
--- a/src/main/java/world/bentobox/limits/commands/LimitPanel.java
+++ b/src/main/java/world/bentobox/limits/commands/LimitPanel.java
@@ -1,5 +1,6 @@
 package world.bentobox.limits.commands;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -105,7 +106,7 @@ public class LimitPanel {
             pb.item(pib.build());
         }
         // Entity limits
-        Map<EntityType, Integer> map = addon.getSettings().getLimits();
+        Map<EntityType, Integer> map = new HashMap<>(addon.getSettings().getLimits());
         // Merge in any permission-based limits
         if (ibc != null) ibc.getEntityLimits().forEach(map::put);
         map.forEach((k,v) -> {
diff --git a/src/main/java/world/bentobox/limits/commands/LimitsCalc.java b/src/main/java/world/bentobox/limits/commands/LimitsCalc.java
index 651b969..683af85 100644
--- a/src/main/java/world/bentobox/limits/commands/LimitsCalc.java
+++ b/src/main/java/world/bentobox/limits/commands/LimitsCalc.java
@@ -1,6 +1,11 @@
 package world.bentobox.limits.commands;
 
-import java.util.*;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;