Fix env variables again