Fixed more unicode issues