added fixes for hydro
merge