Fix main-stats errors, really this time