Fixed some issues for the updated version of Hydra