Minor fixes for support hydro

Minor changes to support hydro (but there are not compatible with groovy)