Fixes to avoid breaking CRM code