Small fixes for Puppet 3.0 compliance