More unicode redering related fixes.