Deployer fixes