More fixes to CDR and Quota values