Fix Puppet issues