diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java
index 4bb946d0..d445ef76 100644
--- a/src/main/java/tconstruct/library/component/MultiFluidTank.java
+++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java
@@ -63,7 +63,7 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
                     liquid.amount -= maxDrain;
                     currentLiquid -= maxDrain;
                 }
-                return new FluidStack(liquid.fluidID, maxDrain, liquid.tag);
+                return new FluidStack(liquid.getFluid(), maxDrain, liquid.tag);
             }
         }
         else
diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
index de2a1c5a..8d6ebabf 100644
--- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
+++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
@@ -134,7 +134,7 @@ public class SmelteryGui extends ActiveContainerGui
 
             if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i])
             {
-                drawFluidStackTooltip(logic.moltenMetal.get(i), mouseX - cornerX + 36, mouseY - cornerY);
+                drawFluidStackTooltip(logic.moltenMetal.get(i), mouseX - cornerX + 36, mouseY - cornerY, false);
             }
             base += fluidHeights[i];
         }
@@ -148,7 +148,7 @@ public class SmelteryGui extends ActiveContainerGui
             int sizeY = logic.getScaledFuelGague(52);
             if (mouseX >= leftX && mouseX <= leftX + sizeX && mouseY >= topY && mouseY < topY + sizeY)
             {
-                drawFluidStackTooltip(new FluidStack(-37, logic.fuelAmount), mouseX - cornerX + 36, mouseY - cornerY);
+                drawFluidStackTooltip(logic.getFuel(), mouseX - cornerX + 36, mouseY - cornerY, true);
             }
         }
     }
@@ -340,10 +340,10 @@ public class SmelteryGui extends ActiveContainerGui
         return fluidHeights;
     }
 
-    protected void drawFluidStackTooltip (FluidStack par1ItemStack, int par2, int par3)
+    protected void drawFluidStackTooltip (FluidStack par1ItemStack, int par2, int par3, boolean fuel)
     {
         this.zLevel = 100;
-        List list = getLiquidTooltip(par1ItemStack, this.mc.gameSettings.advancedItemTooltips);
+        List list = getLiquidTooltip(par1ItemStack, this.mc.gameSettings.advancedItemTooltips, fuel);
 
         for (int k = 0; k < list.size(); ++k)
         {
@@ -354,10 +354,10 @@ public class SmelteryGui extends ActiveContainerGui
         this.zLevel = 0;
     }
 
-    public List getLiquidTooltip (FluidStack liquid, boolean par2)
+    public List getLiquidTooltip (FluidStack liquid, boolean advanced, boolean fuel)
     {
         ArrayList list = new ArrayList();
-        if (liquid.fluidID == -37)
+        if (fuel)
         {
             list.add("\u00A7f" + StatCollector.translateToLocal("gui.smeltery.fuel"));
             list.add("mB: " + liquid.amount);
@@ -543,7 +543,7 @@ public class SmelteryGui extends ActiveContainerGui
 
             if (mouseX >= leftX && mouseX <= leftX + 52 && mouseY >= topY && mouseY < topY + fluidHeights[i])
             {
-                fluidToBeBroughtUp = logic.moltenMetal.get(i).fluidID;
+                fluidToBeBroughtUp = logic.moltenMetal.get(i).getFluidID();
 
                 TConstruct.packetPipeline.sendToServer(new SmelteryPacket(logic.getWorldObj().provider.dimensionId, logic.xCoord, logic.yCoord, logic.zCoord, this.isShiftKeyDown(), fluidToBeBroughtUp));
             }
diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java
index 1c7c7ea6..02ef7dd5 100644
--- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java
+++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java
@@ -247,7 +247,7 @@ public abstract class CastingBlockLogic extends InventoryLogic implements IFluid
     @Override
     public FluidStack drain (int maxDrain, boolean doDrain)
     {
-        if (liquid == null || liquid.fluidID <= 0 || castingDelay > 0)
+        if (liquid == null || liquid.getFluid() == null || liquid.getFluidID() <= 0 || castingDelay > 0)
             return null;
         if (liquid.amount <= 0)
             return null;
diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java
index 9c3b8c19..a3f46bff 100644
--- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java
+++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java
@@ -81,7 +81,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl
             SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z);
             for (FluidStack fstack : smeltery.moltenMetal)
             {
-                if (fstack.fluidID == fluid.getID())
+                if (fstack.getFluidID() == fluid.getID())
                 {
                     containsFluid = true;
                     break;
diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java
index a77c7132..8ee27994 100644
--- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java
+++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java
@@ -1087,7 +1087,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
                     currentLiquid -= maxDrain;
                     needsUpdate = true;
                 }
-                return new FluidStack(liquid.fluidID, maxDrain, liquid.tag);
+                return new FluidStack(liquid.getFluid(), maxDrain, liquid.tag);
             }
         }
         else
diff --git a/src/main/java/tconstruct/util/network/SmelteryPacket.java b/src/main/java/tconstruct/util/network/SmelteryPacket.java
index 0282df2b..7f9e68f9 100644
--- a/src/main/java/tconstruct/util/network/SmelteryPacket.java
+++ b/src/main/java/tconstruct/util/network/SmelteryPacket.java
@@ -73,7 +73,7 @@ public class SmelteryPacket extends AbstractPacket
 
             for (FluidStack liquid : ((SmelteryLogic) te).moltenMetal)
             {
-                if (liquid.fluidID == fluidID)
+                if (liquid.getFluidID() == fluidID)
                 {
                     temp = liquid;
                 }