BundleChecker improvements