Adding checks to upgrade and validation tools