Hydro tweaks, fixes #6808
Merge pull request #6809 from Zuhayr/master

Hydro tweaks, fixes #6808