Bug fixes for billing.