billing API - small bugfixes