some fixes in reporting