Ruby 1.8.5 compatibility changes