Bring fixes on the hydro-devel branch