Charset improvements.