More stat fixes