Hydro tweaks, fixes #6808

Okay. Thanks for explaining that.