CRM-12594 more text fixes