Fixed several issues with water freezing and unfreezing into the incorrect types.