Fixed datasource issues