EL6 and Puppet 2 fixes