fix puppet 2.6 issues