Some Ruby 1.8 compatibility fixes
Generic Ruby is Generic