Fix minor stuff for hydro