Minor improvements to reporting - refs BT#7066