CRM-13026 : minor fixes and improvements