Some bundling improvements