Fixed stat reporting and error correction