Some adaptions for Ruby 2.0 support