More bundling tweaks