diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java
index 846cc8903..9e4f5bf12 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java
@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab;
 import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.GlStateManager;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -113,6 +114,8 @@ public class TabList {
         int tx = x + ((IGridTab.TAB_WIDTH + 1) * num);
         int ty = y;
 
+        GlStateManager.enableAlpha();
+
         gui.bindTexture("icons.png");
 
         if (!isSelected) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
index cfa46d74e..d1df86b8c 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java
@@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nullable;
 
@@ -17,9 +16,9 @@ public class GridStackFluid implements IGridStack {
     private boolean craftable;
     private boolean displayCraftText;
 
-    public GridStackFluid(Pair<Integer, FluidStack> data, @Nullable IStorageTracker.IStorageTrackerEntry entry, boolean craftable, boolean displayCraftText) {
-        this.hash = data.getLeft();
-        this.stack = data.getRight();
+    public GridStackFluid(int hash, FluidStack stack, @Nullable IStorageTracker.IStorageTrackerEntry entry, boolean craftable, boolean displayCraftText) {
+        this.hash = hash;
+        this.stack = stack;
         this.entry = entry;
         this.craftable = craftable;
         this.displayCraftText = displayCraftText;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidDelta.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidDelta.java
index ceea8809f..7f6b79902 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidDelta.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidDelta.java
@@ -19,7 +19,7 @@ public class MessageGridFluidDelta implements IMessage, IMessageHandler<MessageG
     private FluidStack stack;
     private int delta;
 
-    private GridStackFluid clientStack;
+    private GridStackFluid gridStack;
 
     public MessageGridFluidDelta() {
     }
@@ -32,7 +32,7 @@ public class MessageGridFluidDelta implements IMessage, IMessageHandler<MessageG
 
     @Override
     public void fromBytes(ByteBuf buf) {
-        clientStack = new GridStackFluid(StackUtils.readFluidStack(buf), buf.readBoolean() ? new StorageTrackerEntry(buf) : null, buf.readBoolean(), false);
+        gridStack = new GridStackFluid(buf.readInt(), StackUtils.readFluidStack(buf), buf.readBoolean() ? new StorageTrackerEntry(buf) : null, buf.readBoolean(), false);
         delta = buf.readInt();
     }
 
@@ -55,7 +55,7 @@ public class MessageGridFluidDelta implements IMessage, IMessageHandler<MessageG
     @Override
     public IMessage onMessage(MessageGridFluidDelta message, MessageContext ctx) {
         GuiBase.executeLater(GuiGrid.class, grid -> {
-            grid.getView().postChange(message.clientStack, message.delta);
+            grid.getView().postChange(message.gridStack, message.delta);
             grid.getView().sort();
         });
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java
index ad573da45..d2afc01a9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidUpdate.java
@@ -39,7 +39,7 @@ public class MessageGridFluidUpdate implements IMessage, IMessageHandler<Message
         int items = buf.readInt();
 
         for (int i = 0; i < items; ++i) {
-            this.stacks.add(new GridStackFluid(StackUtils.readFluidStack(buf), buf.readBoolean() ? new StorageTrackerEntry(buf) : null, buf.readBoolean(), buf.readBoolean()));
+            this.stacks.add(new GridStackFluid(buf.readInt(), StackUtils.readFluidStack(buf), buf.readBoolean() ? new StorageTrackerEntry(buf) : null, buf.readBoolean(), buf.readBoolean()));
         }
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
index 74b18f4ac..03c16d1e7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
@@ -95,7 +95,12 @@ public class ProxyCommon {
         API.instance().getCraftingTaskRegistry().add(CraftingTaskFactory.ID, new CraftingTaskFactory());
 
         API.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementItemRender.ID, buf -> new CraftingMonitorElementItemRender(StackUtils.readItemStack(buf), buf.readInt(), buf.readInt()));
-        API.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementFluidRender.ID, buf -> new CraftingMonitorElementFluidRender(StackUtils.readFluidStack(buf).getRight(), buf.readInt(), buf.readInt()));
+        API.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementFluidRender.ID, buf -> {
+            // Consume hash
+            buf.readInt();
+
+            return new CraftingMonitorElementFluidRender(StackUtils.readFluidStack(buf), buf.readInt(), buf.readInt());
+        });
         API.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementText.ID, buf -> new CraftingMonitorElementText(ByteBufUtils.readUTF8String(buf), buf.readInt()));
         API.instance().getCraftingMonitorElementRegistry().add(CraftingMonitorElementColor.ID, buf -> {
             int color = buf.readInt();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
index 987007e86..db27bd253 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/util/RenderUtils.java
@@ -157,6 +157,7 @@ public final class RenderUtils {
         public void draw(Minecraft minecraft, int xPosition, int yPosition, FluidStack fluidStack) {
             GlStateManager.enableBlend();
             GlStateManager.enableAlpha();
+            GlStateManager.disableLighting();
 
             drawFluid(minecraft, xPosition, yPosition, fluidStack);
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
index ec35a2a2c..71795edba 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
@@ -67,8 +67,8 @@ public final class StackUtils {
         ByteBufUtils.writeTag(buf, stack.tag);
     }
 
-    public static Pair<Integer, FluidStack> readFluidStack(ByteBuf buf) {
-        return Pair.of(buf.readInt(), new FluidStack(FluidRegistry.getFluid(ByteBufUtils.readUTF8String(buf)), buf.readInt(), ByteBufUtils.readTag(buf)));
+    public static FluidStack readFluidStack(ByteBuf buf) {
+        return new FluidStack(FluidRegistry.getFluid(ByteBufUtils.readUTF8String(buf)), buf.readInt(), ByteBufUtils.readTag(buf));
     }
 
     public static ItemStack nullToEmpty(@Nullable ItemStack stack) {
diff --git a/src/main/resources/assets/refinedstorage/lang/de_de.lang b/src/main/resources/assets/refinedstorage/lang/de_de.lang
index 16f3eef40..474586fff 100755
--- a/src/main/resources/assets/refinedstorage/lang/de_de.lang
+++ b/src/main/resources/assets/refinedstorage/lang/de_de.lang
@@ -19,7 +19,6 @@ gui.refinedstorage:relay=Relais
 gui.refinedstorage:interface.import=Eingabeschnittstelle
 gui.refinedstorage:interface.export=Ausgabeschnittstelle
 gui.refinedstorage:crafting_monitor=Fertigungsmonitor
-gui.refinedstorage:crafting_monitor.fluids_taking=verwende Flüssigkeit
 gui.refinedstorage:crafting_monitor.items_crafting=Teil herstellen
 gui.refinedstorage:crafting_monitor.items_inserting=Teil einfügen
 gui.refinedstorage:crafting_monitor.machine_none=keine Maschine gefunden
diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.lang b/src/main/resources/assets/refinedstorage/lang/en_us.lang
index 3f3b22e77..d37360fa6 100644
--- a/src/main/resources/assets/refinedstorage/lang/en_us.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_us.lang
@@ -27,7 +27,6 @@ gui.refinedstorage:interface.export=Interface Export
 gui.refinedstorage:crafting_monitor=Crafting Monitor
 gui.refinedstorage:wireless_crafting_monitor=Wireless Crafting Monitor
 gui.refinedstorage:crafting_monitor.tooltip.requested=%d requested
-gui.refinedstorage:crafting_monitor.fluids_taking=Fluids taking
 gui.refinedstorage:crafting_monitor.items_crafting=Items crafting
 gui.refinedstorage:crafting_monitor.processing=Processing
 gui.refinedstorage:crafting_monitor.items_inserting=Items inserting
diff --git a/src/main/resources/assets/refinedstorage/lang/es_es.lang b/src/main/resources/assets/refinedstorage/lang/es_es.lang
index 477632e6a..e1b2a36ba 100644
--- a/src/main/resources/assets/refinedstorage/lang/es_es.lang
+++ b/src/main/resources/assets/refinedstorage/lang/es_es.lang
@@ -24,7 +24,6 @@ gui.refinedstorage:interface.import=Interfaz de Entrada
 gui.refinedstorage:interface.export=Interfaz de Salida
 gui.refinedstorage:crafting_monitor=Monitor de fabricación
 gui.refinedstorage:wireless_crafting_monitor=Monitor Remoto de Fabricación
-gui.refinedstorage:crafting_monitor.fluids_taking=Toma de Fluidos
 gui.refinedstorage:crafting_monitor.items_crafting=Fabrica Objetos
 gui.refinedstorage:crafting_monitor.items_inserting=Inserta Objetos
 gui.refinedstorage:crafting_monitor.machine_none=Maquina no Hallada
diff --git a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
index 6fdf1b20d..2d412eaa3 100755
--- a/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
+++ b/src/main/resources/assets/refinedstorage/lang/fr_fr.lang
@@ -23,7 +23,6 @@ gui.refinedstorage:interface.import=Interface d'import
 gui.refinedstorage:interface.export=Interface d'export
 gui.refinedstorage:crafting_monitor=Moniteur de craft
 gui.refinedstorage:wireless_crafting_monitor=Moniteur de craft sans-fil
-gui.refinedstorage:crafting_monitor.fluids_taking=Fluides entrants
 gui.refinedstorage:crafting_monitor.items_crafting=Items en craft
 gui.refinedstorage:crafting_monitor.items_inserting=Insertion d'items
 gui.refinedstorage:crafting_monitor.machine_none=Pas de machine disponible
diff --git a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
index e2832973e..72ce6dd32 100644
--- a/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
+++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.lang
@@ -22,7 +22,6 @@ gui.refinedstorage:interface.import=인터페이스 입력
 gui.refinedstorage:interface.export=인터페이스 출력
 gui.refinedstorage:crafting_monitor=조합 모니터
 gui.refinedstorage:wireless_crafting_monitor=무선 조합 모니터
-gui.refinedstorage:crafting_monitor.fluids_taking=사용할 액체
 gui.refinedstorage:crafting_monitor.items_crafting=제작할 아이템
 gui.refinedstorage:crafting_monitor.items_inserting=삽입할 아이템
 gui.refinedstorage:crafting_monitor.machine_none=기계를 찾을 수 없음
diff --git a/src/main/resources/assets/refinedstorage/lang/pt_br.lang b/src/main/resources/assets/refinedstorage/lang/pt_br.lang
index 1a3d3005e..e28c60475 100755
--- a/src/main/resources/assets/refinedstorage/lang/pt_br.lang
+++ b/src/main/resources/assets/refinedstorage/lang/pt_br.lang
@@ -23,7 +23,6 @@ gui.refinedstorage:interface.import=Importação da Interface
 gui.refinedstorage:interface.export=Exportação da Interface
 gui.refinedstorage:crafting_monitor=Monitor de Fabricações
 gui.refinedstorage:wireless_crafting_monitor=Monitor de Fabricações Wireless
-gui.refinedstorage:crafting_monitor.fluids_taking=Emcaminhando fluidos
 gui.refinedstorage:crafting_monitor.items_crafting=Fabricando itens
 gui.refinedstorage:crafting_monitor.items_inserting=Inserindo itens
 gui.refinedstorage:crafting_monitor.machine_none=Nenhuma máquina encontrada
diff --git a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
index 8369bd96f..dbeb4e086 100755
--- a/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
+++ b/src/main/resources/assets/refinedstorage/lang/ru_ru.lang
@@ -26,7 +26,6 @@ gui.refinedstorage:interface.export=Интерфейс - Экспорт
 gui.refinedstorage:crafting_monitor=Терминал запросов
 gui.refinedstorage:wireless_crafting_monitor=Беспроводной монитор создания
 gui.refinedstorage:crafting_monitor.tooltip.requested=Требует %d
-gui.refinedstorage:crafting_monitor.fluids_taking=Прием жидкостей
 gui.refinedstorage:crafting_monitor.items_crafting=Предметы с возможностью крафта
 gui.refinedstorage:crafting_monitor.items_inserting=Вставка предметов
 gui.refinedstorage:crafting_monitor.machine_none=Машина не найдена
diff --git a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
index 769be7f7a..a9e19b223 100755
--- a/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
+++ b/src/main/resources/assets/refinedstorage/lang/zh_cn.lang
@@ -24,7 +24,6 @@ gui.refinedstorage:interface.import=输入端
 gui.refinedstorage:interface.export=输出端
 gui.refinedstorage:crafting_monitor=合成监控处理器
 gui.refinedstorage:wireless_crafting_monitor=无线合成监控处理器
-gui.refinedstorage:crafting_monitor.fluids_taking=正在装填流体
 gui.refinedstorage:crafting_monitor.items_crafting=正在合成
 gui.refinedstorage:crafting_monitor.items_inserting=物品正在输入
 gui.refinedstorage:crafting_monitor.machine_none=找不到机器