A few more stats fixes, along with what should resolve active worker count problems