Updated a number of hydro-specific changes