Fix some bug in reports - refs BT#7551