Fix some bundler issues