Tier 2/3 upgrade fixes