Fixes to deployer