Attempt to fix new bundler issues