Fix deprecation warnings for Puppet upgrade