Fix more bundler warnings