Fix more encoding issues.