More ruby 1.8.7 fixes