diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java b/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java
index 22566205..12c0cefd 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java
@@ -182,22 +182,22 @@ public class Pterodactyl extends FreedomService
         return URL;
     }
 
-    public String getSERVER_KEY()
+    public String getServerKey()
     {
         return SERVER_KEY;
     }
 
-    public String getADMIN_KEY()
+    public String getAdminKey()
     {
         return ADMIN_KEY;
     }
 
-    public List<String> getSERVER_HEADERS()
+    public List<String> getServerHeaders()
     {
         return SERVER_HEADERS;
     }
 
-    public List<String> getADMIN_HEADERS()
+    public List<String> getAdminHeaders()
     {
         return ADMIN_HEADERS;
     }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
index 73e7bc7a..f9e97dfe 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
@@ -134,13 +134,11 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDamage(EntityDamageEvent event)
     {
-        if (event.getCause() == EntityDamageEvent.DamageCause.LAVA)
+        if ((event.getCause() == EntityDamageEvent.DamageCause.LAVA)
+                && !ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
         {
-            if (!ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
-            {
-                event.setCancelled(true);
-                return;
-            }
+            event.setCancelled(true);
+            return;
         }
 
         if (ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java b/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java
index 16408f09..aab5299c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java
@@ -126,7 +126,7 @@ public class CageData
         this.innerMaterial = inner;
         input = null;
 
-        buildHistory(location, fPlayer);
+        buildHistory(location);
         regenerate();
     }
 
@@ -143,7 +143,7 @@ public class CageData
         this.innerMaterial = inner;
         CageData.input = input;
 
-        buildHistory(location, fPlayer);
+        buildHistory(location);
         regenerate();
     }
 
@@ -197,7 +197,7 @@ public class CageData
         }
     }
 
-    private void buildHistory(Location location, FPlayer playerdata)
+    private void buildHistory(Location location)
     {
         final Block center = location.getBlock();
         for (int xOffset = -2; xOffset <= 2; xOffset++)
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
index 18dfc1a8..1b345999 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
@@ -187,7 +187,7 @@ public class Discord extends FreedomService
                                 @Override
                                 public void onReady(@NotNull ReadyEvent event)
                                 {
-                                    new StartEvent(event.getJDA()).start();
+                                    new StartEvent().start();
                                 }
                             })
                     .setAutoReconnect(true)
@@ -503,7 +503,7 @@ public class Discord extends FreedomService
     // Do no ask why this is here. I spent two hours trying to make a simple thing work
     public class StartEvent
     {
-        public StartEvent(JDA api)
+        public StartEvent()
         {
         }
 
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
index 30a83f57..e51fb163 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
@@ -324,14 +324,13 @@ public class ItemFun extends FreedomService
         {
             arrow = (Arrow)entity;
         }
-        if (arrow != null && (arrow.getShooter() instanceof Player))
+        //Redundant Player cast is required to avoid suspicious method calls.
+        if (arrow != null
+                && (arrow.getShooter() instanceof Player)
+                && explosivePlayers.contains((Player)arrow.getShooter()))
         {
-            //Redundant Player cast is required to avoid suspicious method calls.
-            if (explosivePlayers.contains(arrow.getShooter()))
-            {
-                Objects.requireNonNull(arrow.getLocation().getWorld()).createExplosion(arrow.getLocation().getX(), arrow.getLocation().getY(), arrow.getLocation().getZ(), ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue(), false, ConfigEntry.ALLOW_EXPLOSIONS.getBoolean());
-                arrow.remove();
-            }
+            Objects.requireNonNull(arrow.getLocation().getWorld()).createExplosion(arrow.getLocation().getX(), arrow.getLocation().getY(), arrow.getLocation().getZ(), ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue(), false, ConfigEntry.ALLOW_EXPLOSIONS.getBoolean());
+            arrow.remove();
         }
 
         if (entity instanceof Fireball)
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionConfig.java b/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionConfig.java
index bfc3d3c4..c49faa66 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionConfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/permissions/PermissionConfig.java
@@ -23,7 +23,7 @@ public class PermissionConfig extends FreedomService
     {
         entries = new EnumMap<>(PermissionEntry.class);
 
-        PermissionDefaults tempDefaults = null;
+        PermissionDefaults tempDefaults;
         try
         {
             try
@@ -50,8 +50,6 @@ public class PermissionConfig extends FreedomService
         {
             FLog.severe(ex);
         }
-
-        PermissionDefaults defaults = tempDefaults;
     }
 
     @Override
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/punishments/Punishment.java b/src/main/java/me/totalfreedom/totalfreedommod/punishments/Punishment.java
index 51c90da8..3e532872 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/punishments/Punishment.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/punishments/Punishment.java
@@ -133,12 +133,12 @@ public class Punishment implements IConfig
         this.reason = reason;
     }
 
-    public Date getIssued_on()
+    public Date getIssuedOn()
     {
         return issued_on;
     }
 
-    public void setIssued_on(Date issued_on)
+    public void setIssuedOn(Date issued_on)
     {
         this.issued_on = issued_on;
     }