Relevant fixes to make the reporting process smoother.