Fixing a couple of bugs

Fixing a couple of bugs from the Billing library