source data fixes