These modifications where also needed for the updated bundle cache for installing bundles by references; I forgot them in my last commit.