Fix more issues with unsupported characters.