Few tweaks for Ruby 1.8 support :/