diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java b/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java
index dad2e54..7bd1142 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java
@@ -93,7 +93,7 @@ public abstract class Appliance {
         listeners.forEach(HandlerList::unregisterAll);
     }
 
-    public <T extends Appliance> T queryAppliance(Class<T> clazz) {
+    protected static <T extends Appliance> T queryAppliance(Class<T> clazz) {
         return Main.instance().getAppliance(clazz);
     }
 
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java
index 52cce8b..d341d6d 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java
@@ -38,7 +38,7 @@ public class Outlawed extends Appliance {
                 if(!player.isOnline()) return;
                 if(status != Status.FORCED) return;
                 try {
-                    Main.instance().getAppliance(Whitelist.class).integrityCheck(player);
+                    queryAppliance(Whitelist.class).integrityCheck(player);
                 } catch(DisconnectInfo.Throwable e) {
                     Bukkit.getScheduler().runTask(Main.instance(), () -> e.getDisconnectScreen().applyKick(player));
                 }
@@ -75,7 +75,7 @@ public class Outlawed extends Appliance {
 
     private void setLawStatus(Player player, Status status) {
         playerStatusMap.put(player, status);
-        Main.instance().getAppliance(DisplayName.class).update(player);
+        queryAppliance(DisplayName.class).update(player);
 
         List<String> newList = localConfig().getStringList(voluntarilyEntry);
         if(status.equals(Status.VOLUNTARILY)) {
@@ -93,7 +93,7 @@ public class Outlawed extends Appliance {
     }
 
     private boolean isTimeout(Player player) {
-        return timeouts.get(player.getUniqueId()) < System.currentTimeMillis() - timeoutInMs;
+        return timeouts.getOrDefault(player.getUniqueId(), 0L) > System.currentTimeMillis() - timeoutInMs;
     }
 
     private void setTimeout(Player player) {
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java
index d674ea1..d235b08 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java
@@ -1,6 +1,5 @@
 package eu.mhsl.craftattack.spawn.appliances.settings;
 
-import eu.mhsl.craftattack.spawn.Main;
 import eu.mhsl.craftattack.spawn.appliance.Appliance;
 import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
 import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.Setting;
@@ -37,7 +36,8 @@ public class Settings extends Appliance {
 
     public static Settings instance() {
         if(settingsInstance != null) return settingsInstance;
-        Settings instance = Main.instance().getAppliance(Settings.class);
+        queryAppliance(Settings.class);
+        Settings instance = queryAppliance(Settings.class);
         Settings.settingsInstance = instance;
         return instance;
     }
diff --git a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java
index e0be88d..6f6da89 100644
--- a/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java
+++ b/src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java
@@ -64,7 +64,7 @@ public class Whitelist extends Appliance {
                 );
             }
 
-            Main.instance().getAppliance(Outlawed.class).updateForcedStatus(player, timestampRelevant(user.outlawed_until));
+            queryAppliance(Outlawed.class).updateForcedStatus(player, timestampRelevant(user.outlawed_until));
 
             String purePlayerName;
             if(Floodgate.isBedrock(player)) {