diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java
index d4a659825..fb8b10ae8 100644
--- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java
+++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java
@@ -74,9 +74,19 @@ public class ContainerChemicalOxidizer extends Container
 
 			if(RecipeHandler.getItemToGasOutput(slotStack, false, Recipe.CHEMICAL_OXIDIZER.get()) != null)
 			{
-				if(!mergeItemStack(slotStack, 0, 1, true))
+				if(slotID != 0)
 				{
-					return null;
+					if(!mergeItemStack(slotStack, 0, 1, true))
+					{
+						return null;
+					}
+				}
+				else if(slotID == 0)
+				{
+					if(!mergeItemStack(slotStack, 4, inventorySlots.size(), true))
+					{
+						return null;
+					}
 				}
 			}
 			else if(ChargeUtils.canBeDischarged(slotStack))
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
index cd696e217..36baa1f8d 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
@@ -9,6 +9,7 @@ import mekanism.common.Mekanism;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.FluidContainerUtils;
 import mekanism.common.util.MekanismUtils;
+import mekanism.common.util.PipeUtils;
 import mekanism.generators.common.MekanismGenerators;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -322,7 +323,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
 	@Override
 	public boolean canFill(ForgeDirection from, Fluid fluid)
 	{
-			return (fluid == FluidRegistry.LAVA) && (from != ForgeDirection.getOrientation(facing));
+		return fluid == FluidRegistry.LAVA && from != ForgeDirection.getOrientation(facing);
 	}
 
 	@Override
@@ -334,9 +335,11 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
 	@Override
 	public FluidTankInfo[] getTankInfo(ForgeDirection from)
 	{
-		if(from == ForgeDirection.getOrientation(facing)){
-			return new FluidTankInfo[0];
+		if(from == ForgeDirection.getOrientation(facing))
+		{
+			return PipeUtils.EMPTY;
 		}
+		
 		return new FluidTankInfo[] {lavaTank.getInfo()};
 	}