Fix bundler issues