More unicode fixes.