Improved reporting; fix