Apply fixes for ruby 1.9