Bug fixes to tuning eval and normal eval.