Added more control checks for ice and water (v0.1.4.a22)