Fix water & lava