Further unicode fixes.