3.06: fix duplicate var name and add missing billing function