Several compatibility changes for recent and upcoming Puppet versions