#25 more unicode fixes