Billing CRUD fixes