Updates for ruby 1.9