fixes for CRM-20187