Fixes for Puppet 3 / Ruby 1.9