Fix remaining Hydro build and test issues.