Fixed more Unicode issues.