Evaluation final fixes