Fixed issues found with reports