More fixes for ruby 1.8.7 compatibility