Updated backports to fix issues with ruby 2.0.0p576