Fixes on data sources