misc unicode fixes 2