Fixes for Ruby 2.0 and above