diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCrafting.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCrafting.java
index f7d1aa742..9ef1be430 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCrafting.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCrafting.java
@@ -1,7 +1,7 @@
 package com.raoulvdberge.refinedstorage.container.slot.grid;
 
 import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
+import net.minecraft.inventory.container.Slot;
 
 public class SlotGridCrafting extends Slot {
     public SlotGridCrafting(IInventory inventory, int inventoryIndex, int x, int y) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java
index dde94ba77..13ae084b8 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java
@@ -1,21 +1,18 @@
 package com.raoulvdberge.refinedstorage.container.slot.grid;
 
 import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
-import com.raoulvdberge.refinedstorage.container.ContainerGrid;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.inventory.container.CraftingResultSlot;
 import net.minecraft.item.ItemStack;
 
 import javax.annotation.Nonnull;
 
-public class SlotGridCraftingResult extends SlotCrafting {
-    private ContainerGrid container;
+public class SlotGridCraftingResult extends CraftingResultSlot {
     private IGrid grid;
 
-    public SlotGridCraftingResult(ContainerGrid container, PlayerEntity player, IGrid grid, int inventoryIndex, int x, int y) {
+    public SlotGridCraftingResult(PlayerEntity player, IGrid grid, int inventoryIndex, int x, int y) {
         super(player, grid.getCraftingMatrix(), grid.getCraftingResult(), inventoryIndex, x, y);
 
-        this.container = container;
         this.grid = grid;
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyBase.java
index b2c3af374..e2c8f90ed 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyBase.java
@@ -1,7 +1,7 @@
 package com.raoulvdberge.refinedstorage.container.slot.legacy;
 
 import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
+import net.minecraft.inventory.container.Slot;
 
 import java.util.function.Supplier;
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterFluid.java
index aa6d06880..af8a9a994 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterFluid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterFluid.java
@@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 
 class InventoryWrapperFilterFluid implements IInventoryWrapper {
@@ -33,7 +33,7 @@ class InventoryWrapperFilterFluid implements IInventoryWrapper {
 
         for (int i = 0; i < filterInv.getSlots(); ++i) {
             if (filterInv.getFluid(i) == null) {
-                filterInv.setFluid(i, StackUtils.copy(fluidInContainer, Fluid.BUCKET_VOLUME));
+                filterInv.setFluid(i, StackUtils.copy(fluidInContainer, FluidAttributes.BUCKET_VOLUME));
 
                 return stop;
             }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperInventory.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperInventory.java
index 1e8144e83..914f5c304 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperInventory.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperInventory.java
@@ -1,6 +1,6 @@
 package com.raoulvdberge.refinedstorage.container.transfer;
 
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
@@ -17,9 +17,9 @@ class InventoryWrapperInventory implements IInventoryWrapper {
     InventoryWrapperInventory(IInventory inventory) {
         this.inventory = inventory;
 
-        if (inventory instanceof InventoryPlayer) {
+        if (inventory instanceof PlayerInventory) {
             // Don't use PlayerMainInvWrapper to avoid stack animations.
-            this.wrapper = new RangedWrapper(new InvWrapper(inventory), 0, ((InventoryPlayer) inventory).mainInventory.size());
+            this.wrapper = new RangedWrapper(new InvWrapper(inventory), 0, ((PlayerInventory) inventory).mainInventory.size());
         } else {
             this.wrapper = new InvWrapper(inventory);
         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java
index 8a371210b..335a01ac6 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java
@@ -2,9 +2,9 @@ package com.raoulvdberge.refinedstorage.container.transfer;
 
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
-import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;