Fix initialization and evaluation routines