Minor changes for Ruby 2.1