Make Aggregation Of Collect5 Stats Work

Merged changes from Thom May with some slight changes
to allow Collect5 Stat collection to work.