Fix to water stuff after alex commit