More Unicode fixes.
More unicode fixes.