Ruby 1.9 compatibility fixes