fixes to work with ruby 2.0