diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java
index dc38465b1..ab6cffc22 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBOPLilypad.java
@@ -8,9 +8,12 @@
 
 package biomesoplenty.common.block;
 
+import biomesoplenty.api.block.BOPBlocks;
 import biomesoplenty.common.item.ItemBOPLilypad;
 import net.minecraft.block.BlockLilyPad;
+import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
@@ -21,6 +24,7 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockBloodFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockBloodFluid.java
index 68582c420..333e53cdc 100644
--- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockBloodFluid.java
+++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockBloodFluid.java
@@ -59,7 +59,7 @@ public class BlockBloodFluid extends BlockFluidClassic
 
         for (EnumFacing enumfacing : EnumFacing.values())
         {
-            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.WATER || worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.LAVA))
+            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial().isLiquid() == true))
             {
             	if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock())
             	{
diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java
index 01089e97b..f70ec9e78 100644
--- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java
+++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHoneyFluid.java
@@ -75,7 +75,7 @@ public class BlockHoneyFluid extends BlockFluidFinite
 
         for (EnumFacing enumfacing : EnumFacing.values())
         {
-            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.WATER || worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.LAVA))
+            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial().isLiquid() == true))
             {
             	if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock())
             	{
diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java
index c25c474ac..16157f327 100644
--- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java
+++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockHotSpringWaterFluid.java
@@ -89,7 +89,7 @@ public class BlockHotSpringWaterFluid extends BlockFluidClassic
 
         for (EnumFacing enumfacing : EnumFacing.values())
         {
-            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.WATER || worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.LAVA))
+            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial().isLiquid() == true))
             {
             	if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock())
             	{
diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java
index 4eea4db57..a75a20187 100644
--- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java
+++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockPoisonFluid.java
@@ -75,7 +75,7 @@ public class BlockPoisonFluid extends BlockFluidClassic
 
         for (EnumFacing enumfacing : EnumFacing.values())
         {
-            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.WATER || worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.LAVA))
+            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial().isLiquid() == true))
             {
             	if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock())
             	{
diff --git a/src/main/java/biomesoplenty/common/fluids/blocks/BlockQuicksandFluid.java b/src/main/java/biomesoplenty/common/fluids/blocks/BlockQuicksandFluid.java
index fa6a01171..0b3ca2e94 100644
--- a/src/main/java/biomesoplenty/common/fluids/blocks/BlockQuicksandFluid.java
+++ b/src/main/java/biomesoplenty/common/fluids/blocks/BlockQuicksandFluid.java
@@ -13,8 +13,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -29,6 +27,7 @@ public class BlockQuicksandFluid extends BlockFluidClassic
     public BlockQuicksandFluid(Fluid fluid)
     {
         super(fluid, Material.WATER);
+        
         this.quantaPerBlock = 3;
         this.renderLayer = BlockRenderLayer.SOLID;
     }
@@ -65,7 +64,7 @@ public class BlockQuicksandFluid extends BlockFluidClassic
 
         for (EnumFacing enumfacing : EnumFacing.values())
         {
-            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.WATER || worldIn.getBlockState(pos.offset(enumfacing)).getMaterial() == Material.LAVA))
+            if (enumfacing != EnumFacing.DOWN && (worldIn.getBlockState(pos.offset(enumfacing)).getMaterial().isLiquid() == true))
             {
             	if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock())
             	{