Updated upgrade checks