Minor adjustments to prevent puppet from giveing warnings