Bugfixes in data sources and graphs