[Billing Accounts Fixes]