CRM-12274

more fixes