Better job at checking if bundles are actually installed