CApp Deployer fixes