Fix Ruby 2.0 compatibility issues