Deployer finish improvements
Tasks fixed