More Bundler crap