Fix more UTF-8 bugs
Fix typo