Additional fixes for Ruby 1.9