Fixed bundler issues