Minor updates to run the evaluation.