FIx for upgrade failures
Tweak for disabling example case types