Updated water routines to work with latest 0.4.10 dev