Minor env variables fixes