Make some small improvements to the evaluation