Ruby 2.0 and fixes