Minor fixes for deployer.