Various tweaks for newly added bundles