Some fixes for lava and water.