Fix Puppet woes