Fix more evaluation errors on Hydra.