Added a couple more fixes to reporting code.