Correcting issues with new env variables.