Fixes to allow multiple aggregators on a single page.