Fixes for Ruby 2.1
More ruby version fixes