A few more stat fixes and cleanups