Fix Hydra changes