diff --git a/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java
index 891d0ef27..d671e071e 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiFluidInterfaceConfigurationTerminal.java
@@ -441,7 +441,7 @@ public class GuiFluidInterfaceConfigurationTerminal extends AEBaseGui implements
         ClientDCInternalFluidInv o = this.byId.get(id);
 
         if (o == null) {
-            this.byId.put(id, o = new ClientDCInternalFluidInv(5, id, sortBy, string, 64));
+            this.byId.put(id, o = new ClientDCInternalFluidInv(5, id, sortBy, string, 1000));
             this.refreshList = true;
         }
 
diff --git a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java b/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java
index ee9a3e530..8e4832c10 100644
--- a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java
+++ b/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java
@@ -69,7 +69,8 @@ public class GuiFluidTank extends GuiCustomSlot implements ITooltip {
                 GlStateManager.color(red, green, blue);
 
                 TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite(fluid.getFluid().getStill().toString());
-                final int scaledHeight = (int) (this.height * ((float) fluid.getStackSize() / this.tank.getTankProperties()[this.slot].getCapacity()));
+                int scaledHeight = (int) (this.height * ((float) fluid.getStackSize() / this.tank.getTankProperties()[this.slot].getCapacity()));
+                scaledHeight = Math.min(this.height, scaledHeight);
 
                 int iconHeightRemainder = scaledHeight % 16;
                 if (iconHeightRemainder > 0) {