Fix issues in reporting