Minor Fixes with Evaluation