Fix issues in CRM module