Puppet deploy tweaks