diff --git a/src/main/java/mchorse/metamorph/bodypart/GuiBodyPartEditor.java b/src/main/java/mchorse/metamorph/bodypart/GuiBodyPartEditor.java
index 3c086de7..3a862361 100644
--- a/src/main/java/mchorse/metamorph/bodypart/GuiBodyPartEditor.java
+++ b/src/main/java/mchorse/metamorph/bodypart/GuiBodyPartEditor.java
@@ -97,7 +97,7 @@ public GuiBodyPartEditor(Minecraft mc, GuiAbstractMorph editor)
         {
             if (this.morphPicker == null)
             {
-                IMorphing morphing = Morphing.get(this.mc.thePlayer);
+                IMorphing morphing = Morphing.get(this.mc.player);
 
                 this.morphPicker = new GuiCreativeMorphsMenu(mc, 6, null, morphing);
                 this.morphPicker.resizer().parent(this.area).set(0, 0, 0, 0).w(1, 0).h(1, 0);
@@ -189,7 +189,7 @@ public GuiBodyPartEditor(Minecraft mc, GuiAbstractMorph editor)
         this.children.add(this.addPart, this.removePart, this.bodyParts, this.elements);
 
         /* Inventory */
-        this.inventory = new GuiInventory(this, mc.thePlayer);
+        this.inventory = new GuiInventory(this, mc.player);
 
         for (int i = 0; i < this.slots.length; i++)
         {
@@ -249,7 +249,7 @@ public void setLimbs(Collection<String> limbs)
 
     public void startEditing(BodyPartManager manager)
     {
-        this.inventory.player = this.mc.thePlayer;
+        this.inventory.player = this.mc.player;
         this.parts = manager;
 
         this.bodyParts.setList(manager.parts);
diff --git a/src/main/java/mchorse/metamorph/bodypart/MorphBodyPart.java b/src/main/java/mchorse/metamorph/bodypart/MorphBodyPart.java
index 3fed3d2b..40784126 100644
--- a/src/main/java/mchorse/metamorph/bodypart/MorphBodyPart.java
+++ b/src/main/java/mchorse/metamorph/bodypart/MorphBodyPart.java
@@ -201,7 +201,7 @@ public void fromNBT(NBTTagCompound tag)
             for (int i = 0, c = items.tagCount(); i < c; i++)
             {
                 NBTTagCompound compound = items.getCompoundTagAt(i);
-                ItemStack stack = ItemStack.loadItemStackFromNBT(compound);
+                ItemStack stack = new ItemStack(compound);
 
                 this.slots[i] = stack;
             }
diff --git a/src/main/java/mchorse/metamorph/capabilities/morphing/Morphing.java b/src/main/java/mchorse/metamorph/capabilities/morphing/Morphing.java
index b60b19a7..e6a4f004 100644
--- a/src/main/java/mchorse/metamorph/capabilities/morphing/Morphing.java
+++ b/src/main/java/mchorse/metamorph/capabilities/morphing/Morphing.java
@@ -246,7 +246,7 @@ public boolean setCurrentMorph(AbstractMorph morph, EntityPlayer player, boolean
                 this.morph.demorph(player);
             }
 
-            this.setMorph(morph, player == null ? false : player.worldObj.isRemote);
+            this.setMorph(morph, player == null ? false : player.world.isRemote);
 
             if (player != null)
             {
@@ -267,7 +267,7 @@ public void demorph(EntityPlayer player)
             this.morph.demorph(player);
         }
 
-        this.setMorph(null, player == null ? false : player.worldObj.isRemote);
+        this.setMorph(null, player == null ? false : player.world.isRemote);
     }
 
     /**