couple more fixes for ruby 1.9