Even more unicode fixes