Minor changes to CRM-15557