Minor changes to how it computes stats