more CHAR_T changes