Fix EnvChecks being a direct copy/paste job