Fixing accounting/billing bugs