Fix Ruby 1.8 issues