Updates for Ruby 1.8 syntax