More evaluator fixes