Fixing major upgrade issues