Fixed a few bugs with the data aggregator