more fixes for cap and bundler