Work around a few travis/bundler issues.