Fixes for ruby 1.9