diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java
index a68f49f9e..1d5d087fa 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTransportBehaviour.java
@@ -58,6 +58,9 @@ public abstract class FluidTransportBehaviour extends TileEntityBehaviour {
 		World world = getWorld();
 		BlockPos pos = getPos();
 		boolean onClient = world.isRemote;
+		
+		if (interfaces == null)
+			return;
 		Collection<PipeConnection> connections = interfaces.values();
 
 		// Do not provide a lone pipe connection with its own flow input
diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java
index 31826c321..30c28ccb8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java
@@ -119,7 +119,9 @@ public class BasinTileEntity extends SmartTileEntity {
 
 		inputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.INPUT, this, 2, 1000, true)
 			.whenFluidUpdates(() -> contentsChanged = true);
-		outputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 2, 1000, true).forbidInsertion();
+		outputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 2, 1000, true)
+			.whenFluidUpdates(() -> contentsChanged = true)
+			.forbidInsertion();
 		behaviours.add(inputTank);
 		behaviours.add(outputTank);
 
@@ -251,7 +253,8 @@ public class BasinTileEntity extends SmartTileEntity {
 				newFacing = test;
 		}
 
-		if (preferredSpoutput != null && BasinBlock.canOutputTo(world, pos, preferredSpoutput)  && preferredSpoutput != Direction.UP)
+		if (preferredSpoutput != null && BasinBlock.canOutputTo(world, pos, preferredSpoutput)
+			&& preferredSpoutput != Direction.UP)
 			newFacing = preferredSpoutput;
 
 		if (newFacing != currentFacing)
diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java
index 7322dbce2..8d9ce49bf 100644
--- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java
+++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java
@@ -6,6 +6,7 @@ import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
 import com.simibubi.create.AllTileEntities;
 import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
+import com.simibubi.create.content.contraptions.wrench.IWrenchable;
 import com.simibubi.create.foundation.block.ITE;
 import com.simibubi.create.foundation.item.ItemHelper;
 import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
@@ -34,7 +35,7 @@ import net.minecraftforge.items.ItemStackHandler;
 
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-public class DepotBlock extends Block implements ITE<DepotTileEntity> {
+public class DepotBlock extends Block implements ITE<DepotTileEntity>, IWrenchable {
 
 	public DepotBlock(Properties p_i48440_1_) {
 		super(p_i48440_1_);