CRM-14259 Further Improvements