Fix more UTF-8 issues