Various Bundler fixes