Updates to fix billing.php error