Fixed minor issues in reporting-related classes