Minor fixes to the bundleCharms method.