Fixing up some things for Ruby 1.9.