Fixed two more unicode bugs.