More Unicode fixes.
More Unicode fixes.