* Some evaluator initialization changes