Fixes to work with modern Ruby 2.0 gems.