Fixes for bundler