Report tweak

Needs #1017 first