more unicode fixes