A few Puppet changes