Bugfixes for new multi-source api