more fixes to support puppet 3.x