tweaks to environment checks