Various unicode improvements