Updates for Ruby 2.1