Some reporting improvements