Improve CM/CQB/CMT messages