Changes for Puppet 3.2 compatibility