Fixup the bundle