diff --git a/src/main/java/kamkeel/npcs/command/AbilityCommand.java b/src/main/java/kamkeel/npcs/command/AbilityCommand.java
index 499f9491d..d5b9420cc 100644
--- a/src/main/java/kamkeel/npcs/command/AbilityCommand.java
+++ b/src/main/java/kamkeel/npcs/command/AbilityCommand.java
@@ -4,6 +4,9 @@ import kamkeel.npcs.controllers.data.ability.Ability;
 import kamkeel.npcs.controllers.data.ability.AbilityController;
 import net.minecraft.command.ICommandSender;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
 import static kamkeel.npcs.util.ColorUtil.sendError;
diff --git a/src/main/java/noppes/npcs/scripted/wrapper/ScriptDataAbilities.java b/src/main/java/noppes/npcs/scripted/wrapper/ScriptDataAbilities.java
index 6cbbb4dae..d0b5259ea 100644
--- a/src/main/java/noppes/npcs/scripted/wrapper/ScriptDataAbilities.java
+++ b/src/main/java/noppes/npcs/scripted/wrapper/ScriptDataAbilities.java
@@ -2,12 +2,15 @@ package noppes.npcs.scripted.wrapper;
 
 import kamkeel.npcs.controllers.data.ability.Ability;
 import kamkeel.npcs.controllers.data.ability.AbilityController;
+import kamkeel.npcs.controllers.data.ability.AbilitySlot;
 import net.minecraft.entity.EntityLivingBase;
 import noppes.npcs.DataAbilities;
 import noppes.npcs.api.ability.IAbility;
 import noppes.npcs.api.ability.IDataAbilities;
 import noppes.npcs.entity.EntityNPCInterface;
 
+import java.util.List;
+
 /**
  * Script wrapper for DataAbilities providing API access to NPC abilities.
  */
@@ -65,7 +68,7 @@ public class ScriptDataAbilities implements IDataAbilities {
 
     @Override
     public boolean isAbilityReference(String abilityId) {
-        List<kamkeel.npcs.controllers.data.ability.AbilitySlot> slots = data.getAbilitySlots();
+        List<AbilitySlot> slots = data.getAbilitySlots();
         for (int i = 0; i < slots.size(); i++) {
             kamkeel.npcs.controllers.data.ability.AbilitySlot slot = slots.get(i);
             if (slot.isReference()) {
diff --git a/src/main/java/noppes/npcs/scripted/wrapper/ScriptPlayerAbilityData.java b/src/main/java/noppes/npcs/scripted/wrapper/ScriptPlayerAbilityData.java
index 2570653fc..a36c65d51 100644
--- a/src/main/java/noppes/npcs/scripted/wrapper/ScriptPlayerAbilityData.java
+++ b/src/main/java/noppes/npcs/scripted/wrapper/ScriptPlayerAbilityData.java
@@ -21,7 +21,7 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
 
     @Override
     public String[] getUnlockedAbilities() {
-        return data.getUnlockedAbilities().toArray(new String[0]);
+        return data.getUnlockedAbilities();
     }
 
     @Override
@@ -79,6 +79,11 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
         data.interruptCurrentAbility();
     }
 
+    @Override
+    public boolean isOnCooldown() {
+        return data.isOnCooldown();
+    }
+
     @Override
     public boolean isOnCooldown(String key) {
         EntityPlayer player = playerData.player;
@@ -86,6 +91,11 @@ public class ScriptPlayerAbilityData implements IPlayerAbilityData {
         return data.isOnCooldown(key, player);
     }
 
+    @Override
+    public void resetCooldown() {
+        data.resetCooldown();
+    }
+
     @Override
     public void resetCooldown(String key) {
         data.resetCooldown(key);