fixes for Ruby 2.0