fixes for ruby 2.1.5