Updates for Puppet versions compatibility