Fixes in evaluator