General reporting improvements