Improved upgrade checks