Package fixes for hydro.