Small workflow & logic improvements in datasources.