Fixed looking for env variables