Merge pull request #1068 from sjpadgett/billing-fixes