Minor improvements to reporting part