Char set bug fixes