Fixes to bypassBilling