AUTO: More tweaking to deployer