Fixed some env variables