Hydro tweaks, fixes #6808