Fixed ENV vars