Unicode handling fixes.