Bugfixes for reporting