CRM-13611 - Report fixes