Fix isues with Ruby 1.8.7