Temporary repairs for CRuby 2.1.0