FIx for upgrade failures
Tweak for disabling example case types
Modification to update entity ID for managed entities