Minor improvements in evaluator