Several tweaks/fixes for newhydro.
Compiile fix.
Should fix clam mode. Wish I could test it here.
Merge pull request #6413 from Zuhayr/master

Several tweaks/fixes for newhydro.