Several compatibility change for recent and upcoming Puppet versions