Fixed remaining char_str() problems

Fixed all the remaining calls to char_str() so that it should build correctly.