make things puppet 3 ready