fixes needed to for the datasource deployer feature