Fix some issues with bundling