[Billing] [Fix] Fix some minor bugs