AUTO: More improvements on deployer