fixes for E-Rater