fixes for CRM-13056