more fixes for datacollection changes *sigh*