More CString fixes.