Updates to pre-requisite checking