More Ruby 1.8 fixes