assertEval fixes