Fixes to parse of agg