diff --git a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
index 4d21f8628..b261731a1 100644
--- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
@@ -56,12 +56,12 @@ public class Archery {
      * @param entity The entity hit by the arrows
      */
     public static void arrowRetrievalCheck(LivingEntity livingEntity) {
-        for (Iterator<TrackedEntity> it = trackedEntities.iterator() ; it.hasNext() ; ) {
-            TrackedEntity trackedEntity = it.next();
+        for (Iterator<TrackedEntity> entityIterator = trackedEntities.iterator(); entityIterator.hasNext(); ) {
+            TrackedEntity trackedEntity = entityIterator.next();
 
-            if (trackedEntity.getLivingEntity() == livingEntity) {
+            if (trackedEntity.getLivingEntity().getEntityId() == livingEntity.getEntityId()) {
                 Misc.dropItems(livingEntity.getLocation(), new ItemStack(Material.ARROW), trackedEntity.getArrowCount());
-                it.remove();
+                entityIterator.remove();
                 return;
             }
         }
diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
index f32705a5a..0567bf9cd 100755
--- a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
+++ b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
@@ -404,7 +404,7 @@ public class Fishing {
                 break;
 
             case SQUID:
-                ItemStack item = new ItemStack(Material.INK_SACK, 1, (short) 0);
+                ItemStack item = new ItemStack(Material.INK_SACK, 1);
                 item.setData(new MaterialData(Material.INK_SACK, DyeColor.BLACK.getDyeData()));
 
                 Misc.dropItem(location, item);