Additional updates for Ruby 1.9 compatibility