fix for aggregate sources + some old source types