Fixing up bundler issues, hopefully