Fixed some dependencies issues for hydro