some fixes for deployer