Fixed more Unicode problems