diff --git a/API/pom.xml b/API/pom.xml
index 9e22eeac..38fd6c35 100644
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/NMS/v1_15_R1/pom.xml b/NMS/v1_15_R1/pom.xml
index 2a954db4..9ec49931 100644
--- a/NMS/v1_15_R1/pom.xml
+++ b/NMS/v1_15_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/NMS/v1_16_R1/pom.xml b/NMS/v1_16_R1/pom.xml
index 6511b282..57880d18 100644
--- a/NMS/v1_16_R1/pom.xml
+++ b/NMS/v1_16_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
index bbeed521..6b25eb7d 100644
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
@@ -1,6 +1,8 @@
 package com.willfp.ecoenchants.v1_16_R1;
 
 import com.willfp.ecoenchants.API.CooldownWrapper;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 
 public class Cooldown implements CooldownWrapper {
diff --git a/NMS/v1_16_R2/pom.xml b/NMS/v1_16_R2/pom.xml
index 1ed9cf4e..d6698a8a 100644
--- a/NMS/v1_16_R2/pom.xml
+++ b/NMS/v1_16_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/Plugin/pom.xml b/Plugin/pom.xml
index 2cbf3c48..0d15a315 100644
--- a/Plugin/pom.xml
+++ b/Plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
     </parent>
 
     <artifactId>plugin</artifactId>
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcodebug.java b/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcodebug.java
index b3b00fed..034ef3f2 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcodebug.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcodebug.java
@@ -3,6 +3,7 @@ package com.willfp.ecoenchants.commands;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
 import com.willfp.ecoenchants.config.ConfigManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
+import com.willfp.ecoenchants.nms.Cooldown;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/DisplayPacketAdapter.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/DisplayPacketAdapter.java
index 3c55412b..7597d30d 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/DisplayPacketAdapter.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/DisplayPacketAdapter.java
@@ -3,7 +3,9 @@ package com.willfp.ecoenchants.display;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
+import org.bukkit.Bukkit;
 import org.bukkit.inventory.MerchantRecipe;
 
 import java.util.Arrays;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
index 65e10b75..42c2c8eb 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
@@ -133,8 +133,6 @@ public class EnchantDisplay {
         if(!EnchantmentTarget.ALL.contains(item.getType()))
             return oldItem;
 
-        item = revertDisplay(item);
-
         ItemMeta meta = item.getItemMeta();
         List<String> itemLore = new ArrayList<>();
 
@@ -142,6 +140,8 @@ public class EnchantDisplay {
 
         if(meta == null) return oldItem;
 
+        item = revertDisplay(item);
+
         if(meta.getPersistentDataContainer().has(keySkip, PersistentDataType.INTEGER))
             return oldItem;
 
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java
index 181af5aa..01d0612e 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java
@@ -5,6 +5,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
 import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.ecoenchants.util.VectorUtils;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -42,6 +43,9 @@ public class Grapple extends EcoEnchant {
 
         double baseMultiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "velocity-multiplier");
         Vector vector = player.getLocation().toVector().clone().subtract(victim.getLocation().toVector()).normalize().multiply(level * baseMultiplier);
-        victim.setVelocity(vector);
+
+        if(VectorUtils.isFinite(vector)) {
+            victim.setVelocity(vector);
+        }
     }
 }
diff --git a/Plugin/src/main/resources/enchants/normal/drill.yml b/Plugin/src/main/resources/enchants/normal/drill.yml
index 58ef21f5..1f141394 100644
--- a/Plugin/src/main/resources/enchants/normal/drill.yml
+++ b/Plugin/src/main/resources/enchants/normal/drill.yml
@@ -16,7 +16,9 @@ obtaining:
 
 general-config:
   targets:
+    - pickaxe
     - axe
+    - shovel
   grindstoneable: true
   conflicts:
     - lumberjack
diff --git a/Plugin/src/main/resources/enchants/normal/infernaltouch.yml b/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
index 83b1206c..674649a1 100644
--- a/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
+++ b/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
@@ -17,9 +17,6 @@ obtaining:
 general-config:
   targets:
     - pickaxe
-    - axe
-    - shovel
-    - hoe
   grindstoneable: true
   conflicts:
     - silk_touch
diff --git a/pom.xml b/pom.xml
index 3a486921..f2be3919 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.willfp.ecoenchants</groupId>
     <artifactId>parent</artifactId>
-    <version>5.0.0-beta4</version>
+    <version>5.0.0-beta5</version>
     <packaging>pom</packaging>
     <name>EcoEnchants Parent</name>