Updates to run on Ruby 2.0