Fix several bugs in Evaluator