Adds Ruby 1.8.7 support fixes