Fix billing handling.