Fix datasource setup