Minor tweaks and updates to BundleComparator and related classes