Updates for Ruby 2.0