Fix bugs in MakeBundle creation