Improve accuracy reporting and increase robustness