Fixes to average data