Several tweaks/fixes for newhydro.

Should fix everything in #6412 except for the bio-luminescence issue.