Fix deprecation warnings for newer Puppet version