Changes for new puppet version