Ruby 1.8.7 compat fixes