Bundle tweaks