Tweaks in evaluation.