even more bundler fixes