Evaluator bugs fixed