More deployer/figaro fixes.