Quick hacks to make it work with Ruby 1.8