Fixed the SAE Evaluation Service issues.