Billing Fixes