fix data source problems