Make gem 1.8.7 ready