Fixed a couple of issues that were causing numbers to be reported incorrectly