Fixes on the billing system