bundler fixes