diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractTabCompleter.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractTabCompleter.java
index f4100bc5..6fdf897e 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractTabCompleter.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractTabCompleter.java
@@ -12,7 +12,7 @@ import java.util.List;
 public abstract class AbstractTabCompleter implements TabCompleter {
     private final AbstractCommand command;
 
-    public AbstractTabCompleter(AbstractCommand command) {
+    protected AbstractTabCompleter(AbstractCommand command) {
         this.command = command;
     }
 
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java
index 2eae0419..528b28a1 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java
@@ -55,8 +55,8 @@ public class Aiming extends EcoEnchant {
         double force = arrow.getVelocity().clone().length() / 3;
         force = NumberUtils.equalIfOver(force, 1);
 
-        if(this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "require-full-force")) {
-            if(force < 0.9) return;
+        if(this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "require-full-force") && force < 0.9) {
+            return;
         }
 
         if(this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "scale-on-force")) {
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java
index e0d11cd4..0d454340 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java
@@ -205,11 +205,11 @@ public class AnvilMerge {
                 outEnchantLevels.addAndGet(integer);
             }
         }));
-        leftEnchants.forEach((((enchantment, integer) -> {
+        leftEnchants.forEach(((enchantment, integer) -> {
             if (EcoEnchants.getFromEnchantment(enchantment) != null) {
                 outEnchantLevels.addAndGet(integer);
             }
-        })));
+        }));
 
         totalEnchantLevelDelta = Math.abs(outEnchantLevels.intValue() - inEnchantLevels.intValue());
 
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefFactionsUUID.java b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefFactionsUUID.java
index bd935dfa..ee9795cf 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefFactionsUUID.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/plugins/AntigriefFactionsUUID.java
@@ -23,7 +23,6 @@ public class AntigriefFactionsUUID implements AntigriefWrapper {
 
     @Override
     public boolean canCreateExplosion(Player player, Location location) {
-        FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
         FLocation flocation = new FLocation(location);
         Faction faction = Board.getInstance().getFactionAt(flocation);
 
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/ArrowListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/ArrowListeners.java
index a5531aed..16dec210 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/ArrowListeners.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/ArrowListeners.java
@@ -30,7 +30,6 @@ public class ArrowListeners implements Listener {
 
         ItemStack item = entity.getEquipment().getItemInMainHand();
 
-        if (item == null) return;
         if (item.getType().equals(Material.AIR)) return;
         if (!item.hasItemMeta()) return;
         if (item.getItemMeta() == null) return;