diff --git a/build.gradle b/build.gradle
index 29331e13a..bb988c5ac 100755
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "1.10.2-12.18.1.2046"
+    version = "1.10.2-12.18.1.2065"
     runDir = "run"
     useDepAts = true
     mappings = "snapshot_20160518"
@@ -43,9 +43,9 @@ repositories {
 }
 
 dependencies {
-    deobfCompile "mezz.jei:jei_1.10.2:3.7.+"
+    deobfCompile "mezz.jei:jei_1.10.2:3.9.+"
     compile "net.darkhax.tesla:Tesla:1.10-1.2.+"
-    compile "net.industrial-craft:industrialcraft-2:2.6.37-ex110:api"
+    compile "net.industrial-craft:industrialcraft-2:2.6.41-ex110:api"
     deobfCompile "MCMultiPart:MCMultiPart:1.2.1+:universal"
 }
 
diff --git a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java b/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java
index 3ec3e60fd..8760ef1e8 100755
--- a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java
+++ b/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidStorageNBT.java
@@ -50,7 +50,11 @@ public abstract class FluidStorageNBT implements IFluidStorage {
         NBTTagList list = (NBTTagList) tag.getTag(NBT_FLUIDS);
 
         for (int i = 0; i < list.tagCount(); ++i) {
-            stacks.add(FluidStack.loadFluidStackFromNBT(list.getCompoundTagAt(i)));
+            FluidStack stack = FluidStack.loadFluidStackFromNBT(list.getCompoundTagAt(i));
+
+            if (stack != null) {
+                stacks.add(stack);
+            }
         }
     }
 
diff --git a/src/main/java/refinedstorage/container/ContainerStorage.java b/src/main/java/refinedstorage/container/ContainerStorage.java
index 01f93d584..e65a0b32b 100755
--- a/src/main/java/refinedstorage/container/ContainerStorage.java
+++ b/src/main/java/refinedstorage/container/ContainerStorage.java
@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import refinedstorage.container.slot.SlotSpecimen;
 import refinedstorage.tile.TileStorage;
 
+//bla
 public class ContainerStorage extends ContainerBase {
     public ContainerStorage(TileStorage tile, EntityPlayer player) {
         super(tile, player);
diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java
index 2edd39de0..dafef1053 100755
--- a/src/main/java/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/refinedstorage/tile/TileConstructor.java
@@ -94,7 +94,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
             } else if (type == IType.FLUIDS) {
                 FluidStack stack = fluidFilters.getFluids()[0];
 
-                if (stack != null) {
+                if (stack != null && stack.getFluid().canBePlacedInWorld()) {
                     BlockPos front = pos.offset(getDirection());
 
                     Block block = stack.getFluid().getBlock();
@@ -103,10 +103,8 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
                         FluidStack took = network.extractFluid(stack, Fluid.BUCKET_VOLUME, compare);
 
                         if (took != null) {
-                            IBlockState state = block.getDefaultState();
-
-                            // @TODO: This doesn't cause the block to flow?
-                            worldObj.setBlockState(front, state, 1 | 2);
+                            // @TODO: Won't update
+                            worldObj.setBlockState(front, block.getDefaultState(), 11);
                         }
                     }
                 }