Fix Issues with Billing Related Revenue Leakage