CRM-12289

Minor improvements.