Trying to fix datasource references.