[#52482767] fixes for ruby2.0 upgrade