Fix puppet deprecation warnings