misc unicode fixes 3