Fix more encoding errors