Update: fixes for use with Ruby 2.0.0