Corrected some env vars