Workaround bundler issues